* 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@26251 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 15 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 6b6d1ee6d0..34ded06958 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan  8 17:02:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	 * ruby.h (RB_GC_GUARD_PTR): workaround for gcc optimization.
+	   [ruby-core:27402]
+
 Fri Jan  1 15:42:46 2010  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/mkmf.rb: Fix build.  COUTFLAG is not yet landed on this
diff --git a/ruby.h b/ruby.h
index f03ce0d500..b44fb9bd34 100644
--- a/ruby.h
+++ b/ruby.h
@@ -227,7 +227,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)
diff --git a/version.h b/version.h
index fd52df8dc7..fce5fb474a 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-01-01"
+#define RUBY_RELEASE_DATE "2010-01-08"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100101
+#define RUBY_RELEASE_CODE 20100108
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 8
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];