3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d160f5e89c..330298b155 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 22 09:08:02 2010  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (UINT2NUM): fix ifdef condition for LLP64.
+	  reported by Daniel Gutmanas.  [ruby-core:31778]
+
 Sun Aug 22 05:55:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in: fix typo.  a patch from Eric Wong at
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 83df1a3946..e6a3e653ba 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -936,7 +936,7 @@ struct RBignum {
 #define OBJ_FROZEN(x) (!!FL_TEST((x), FL_FREEZE))
 #define OBJ_FREEZE(x) FL_SET((x), FL_FREEZE)
 
-#if SIZEOF_INT < SIZEOF_VALUE
+#if SIZEOF_INT < SIZEOF_LONG
 # define INT2NUM(v) INT2FIX((int)(v))
 # define UINT2NUM(v) LONG2FIX((unsigned int)(v))
 #else
diff --git a/version.h b/version.h
index da4d1793be..587e3fbe70 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.2"
 #define RUBY_RELEASE_DATE "2010-09-29"
-#define RUBY_PATCHLEVEL 5
+#define RUBY_PATCHLEVEL 6
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9