1 files changed, 15 insertions, 3 deletions
diff --git a/numeric.c b/numeric.c
index 7dd53713d9..8335a2c45c 100644
--- a/numeric.c
+++ b/numeric.c
@@ -3937,9 +3937,9 @@ fix_or(VALUE x, VALUE y)
 }
 
 /*
- * Document-method: Fixnum#^
+ * Document-method: Integer#^
  * call-seq:
- *   fix ^ integer  ->  integer_result
+ *   integer ^ integer  ->  integer_result
  *
  * Bitwise EXCLUSIVE OR.
  */
@@ -3960,6 +3960,18 @@ fix_xor(VALUE x, VALUE y)
     return rb_funcall(x, '^', 1, y);
 }
 
+static VALUE
+int_xor(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(x)) {
+	return fix_xor(x, y);
+    }
+    else if (RB_TYPE_P(x, T_BIGNUM)) {
+	return rb_big_xor(x, y);
+    }
+    return Qnil;
+}
+
 /*
  * Document-method: Integer#<<
  * call-seq:
@@ -4758,7 +4770,7 @@ Init_Numeric(void)
     rb_define_method(rb_cFixnum, "~", fix_rev, 0);
     rb_define_method(rb_cFixnum, "&", fix_and, 1);
     rb_define_method(rb_cFixnum, "|", fix_or,  1);
-    rb_define_method(rb_cFixnum, "^", fix_xor, 1);
+    rb_define_method(rb_cInteger, "^", int_xor, 1);
     rb_define_method(rb_cInteger, "[]", int_aref, 1);
 
     rb_define_method(rb_cInteger, "<<", rb_int_lshift, 1);