* numeric.c (rb_num2ull): use FIX2LONG instead of FIX2ULONG. see

  rb_num2ulong(). fixed the problem of ObjectSpace._id2ref of IL32LLP64
  platforms, introduced at r32433.
  backported r32512 from trunk.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32514 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 021a05ac3a..b2d39ba5ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jul 11 15:17:03 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (rb_num2ull): use FIX2LONG instead of FIX2ULONG. see
+	  rb_num2ulong(). fixed the problem of ObjectSpace._id2ref of IL32LLP64
+	  platforms, introduced at r32433.
+	  backported r32512 from trunk.
+
 Sun Jul 10 23:58:55 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* version.h: 1.9.3 is no longer trunk.
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