From f73a2e8e2a787bfa777dea7342e6d433d8df52ac Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 30 Jan 2010 12:45:56 +0000 Subject: merges r25294 from trunk into ruby_1_9_1. -- * include/ruby/ruby.h (RB_GC_GUARD_PTR): workaround for gcc optimization. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26479 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ include/ruby/ruby.h | 8 +++++++- version.h | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8dddb6c947..e1fdf754ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Oct 11 09:04:08 2009 Nobuyoshi Nakada + + * include/ruby/ruby.h (RB_GC_GUARD_PTR): workaround for gcc + optimization. + + * include/ruby/ruby.h (ruby_exec_node): declared. + Sat Oct 10 23:57:44 2009 Nobuyoshi Nakada * file.c (path_check_0): prevent from GC. diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index eff93e96d7..4da4cf04fc 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -350,7 +350,13 @@ enum ruby_value_type { #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) diff --git a/version.h b/version.h index c0643e47ce..c4ea0aba15 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 384 +#define RUBY_PATCHLEVEL 385 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3