yugui	2010-09-29 21:25:38 +0900 (Wed, 29 Sep 2010)

  New Revision: 29372

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29372

  Log:
    merges r29068 from trunk into ruby_1_9_2.
    --
    * include/ruby/ruby.h (UINT2NUM): fix ifdef condition for LLP64.
      reported by Daniel Gutmanas.  [ruby-core:31778]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/include/ruby/ruby.h
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/include/ruby/ruby.h
===================================================================
--- ruby_1_9_2/include/ruby/ruby.h	(revision 29371)
+++ ruby_1_9_2/include/ruby/ruby.h	(revision 29372)
@@ -936,7 +936,7 @@
 #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
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29371)
+++ ruby_1_9_2/ChangeLog	(revision 29372)
@@ -1,3 +1,8 @@
+Sun Aug 22 09:08:02 2010  Tanaka Akira  <akr@f...>
+
+	* 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@r...>
 
 	* configure.in: fix typo.  a patch from Eric Wong at
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29371)
+++ ruby_1_9_2/version.h	(revision 29372)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/