diff --git a/ChangeLog b/ChangeLog
index 1a3c4aaebd..2dae535c24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 16 23:20:24 2012  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_integer_float_cmp): use FIXNUM_MIN and FIXNUM_MAX,
+	  instead of LONG_MIN and LONG_MAX.
+
 Mon Jul 16 22:50:41 2012  Tanaka Akira  <akr@fsij.org>
 
 	* numeric.c (flo_to_s): use the exponential form if the integer part
diff --git a/bignum.c b/bignum.c
index 1e8baee8dd..30e1e8a8e9 100644
--- a/bignum.c
+++ b/bignum.c
@@ -1455,9 +1455,9 @@ rb_integer_float_cmp(VALUE x, VALUE y)
         return INT2FIX(0);
 #else
         long xl, yl;
-        if (yi < LONG_MIN)
+        if (yi < FIXNUM_MIN)
             return INT2FIX(1);
-        if (LONG_MAX < yi)
+        if (FIXNUM_MAX+1 <= yi)
             return INT2FIX(-1);
         xl = FIX2LONG(x);
         yl = (long)yi;