2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e192ae8e63..c4c3ba393c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Wed Oct 13 22:51:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Oct 13 22:53:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (check_uint): get rid of overflow on LLP64 platforms.
 
 	* insns.def (opt_case_dispatch): use st_data_t.
 
diff --git a/numeric.c b/numeric.c
index 26ce683daa..9c82b20fe6 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1824,7 +1824,7 @@ check_uint(VALUE num, VALUE sign)
     if (RTEST(sign)) {
 	/* minus */
 	if ((num & mask) != mask || (num & ~mask) <= INT_MAX + 1UL)
-#define VALUE_MSBMASK   (1L << ((sizeof(VALUE) * CHAR_BIT) - 1))
+#define VALUE_MSBMASK   ((VALUE)1 << ((sizeof(VALUE) * CHAR_BIT) - 1))
 	    rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too small to convert to `unsigned int'", num|VALUE_MSBMASK);
     }
     else {