2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b1c51c9f8a..1fe10bdeb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 11 15:02:24 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (rb_num2ull): use FIX2LONG instead of FIX2ULONG. see
+	  rb_num2ulong().
+
 Mon Jul 11 05:38:05 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
 
 	* thread_pthread.c (get_stack): need to adjust stack addr for
diff --git a/numeric.c b/numeric.c
index 32a1a75289..272bbd1e76 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1981,7 +1981,7 @@ rb_num2ull(VALUE val)
 	rb_raise(rb_eTypeError, "no implicit conversion from nil");
 
       case T_FIXNUM:
-	return (LONG_LONG)FIX2ULONG(val);
+	return (LONG_LONG)FIX2LONG(val); /* this is FIX2LONG, inteneded */
 
       case T_FLOAT:
 	if (RFLOAT_VALUE(val) < ULLONG_MAX_PLUS_ONE