3 files changed, 11 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d49f72f1d..eb5cbb2fcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Apr 30 14:42:20 2016  Tanaka Akira  <[email protected]>
+
+	* numeric.c (rb_int_idiv): {Fixnum,Bignum}#div is unified into
+	  Integer.
+
+	* bignum.c (rb_big_idiv): Don't define Bignum#div.
+
 Sat Apr 30 14:25:55 2016  Tanaka Akira  <[email protected]>
 
 	* numeric.c (rb_int_modulo): {Fixnum,Bignum}#modulo is unified into
diff --git a/bignum.c b/bignum.c
index 8c23291434..aedb7758c1 100644
--- a/bignum.c
+++ b/bignum.c
@@ -6113,13 +6113,6 @@ rb_big_div(VALUE x, VALUE y)
     return rb_big_divide(x, y, '/');
 }
 
-/*
- *  call-seq:
- *     big.div(other)  -> integer
- *
- * Performs integer division: returns integer value.
- */
-
 VALUE
 rb_big_idiv(VALUE x, VALUE y)
 {
@@ -6903,7 +6896,6 @@ Init_Bignum(void)
     rb_define_method(rb_cBignum, "*", rb_big_mul, 1);
     rb_define_method(rb_cBignum, "/", rb_big_div, 1);
     rb_define_method(rb_cBignum, "%", rb_big_modulo, 1);
-    rb_define_method(rb_cBignum, "div", rb_big_idiv, 1);
     rb_define_method(rb_cBignum, "remainder", rb_big_remainder, 1);
 
     rb_define_method(rb_cBignum, "==", rb_big_eq, 1);
diff --git a/numeric.c b/numeric.c
index 40d6139243..92545453d5 100644
--- a/numeric.c
+++ b/numeric.c
@@ -3466,11 +3466,11 @@ fix_div(VALUE x, VALUE y)
 }
 
 /*
- * Document-method: Fixnum#div
+ * Document-method: Integer#div
  * call-seq:
- *   fix.div(numeric)  ->  integer
+ *   int.div(numeric)  ->  integer
  *
- * Performs integer division: returns integer result of dividing +fix+ by
+ * Performs integer division: returns integer result of dividing +int+ by
  * +numeric+.
  */
 
@@ -4839,7 +4839,7 @@ Init_Numeric(void)
     rb_define_method(rb_cFixnum, "-", fix_minus, 1);
     rb_define_method(rb_cFixnum, "*", fix_mul, 1);
     rb_define_method(rb_cFixnum, "/", fix_div, 1);
-    rb_define_method(rb_cFixnum, "div", fix_idiv, 1);
+    rb_define_method(rb_cInteger, "div", rb_int_idiv, 1);
     rb_define_method(rb_cFixnum, "%", fix_mod, 1);
     rb_define_method(rb_cInteger, "modulo", rb_int_modulo, 1);
     rb_define_method(rb_cInteger, "divmod", int_divmod, 1);