diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-19 22:54:43 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-19 22:54:43 +0000 |
commit | da40596535e905053df444cf32e588d133afb57b (patch) | |
tree | ddeb7420cbe0cc5a3d8719fd6fd0d9927f0b87af | |
parent | 885ecb9d4c3284f54496601433e2facac00e371a (diff) |
merge revision(s) 26251:
* ruby.h (RB_GC_GUARD_PTR): workaround for gcc optimization.
[ruby-core:27402]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27408 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ruby.h | 8 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 16 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Mon Apr 19 22:43:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ruby.h (RB_GC_GUARD_PTR): workaround for gcc optimization. + [ruby-core:27402] + Tue Apr 20 06:40:53 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca> * lib/uri/generic.rb (URI::Generic::eql): Check the class of the @@ -224,7 +224,13 @@ VALUE rb_ull2inum _((unsigned LONG_LONG)); #define TYPE(x) rb_type((VALUE)(x)) -#define RB_GC_GUARD(v) (*(volatile VALUE *)&(v)) +#ifdef __GNUC__ +#define RB_GC_GUARD_PTR(ptr) \ + __extension__ ({volatile VALUE *rb_gc_guarded_ptr = (ptr); rb_gc_guarded_ptr;}) +#else +#define RB_GC_GUARD_PTR(ptr) (volatile VALUE *)(ptr) +#endif +#define RB_GC_GUARD(v) (*RB_GC_GUARD_PTR(&(v))) void rb_check_type _((VALUE,int)); #define Check_Type(v,t) rb_check_type((VALUE)(v),t) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2010-04-20" +#define RUBY_RELEASE_DATE "2010-04-19" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20100420 -#define RUBY_PATCHLEVEL 252 +#define RUBY_RELEASE_CODE 20100419 +#define RUBY_PATCHLEVEL 253 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 19 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |