diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-09-29 12:25:38 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-09-29 12:25:38 +0000 |
commit | 96f0473ef6e357e6f9f360540019834848a2384f (patch) | |
tree | 4672840664566d4d22006085838acf4c07e22bfe | |
parent | 99f18d4d69ea243402d7bff2f56d0863d9a09a41 (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | include/ruby/ruby.h | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -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 @@ -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 |