yugui	2010-01-30 21:45:56 +0900 (Sat, 30 Jan 2010)

  New Revision: 26479

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

  Log:
    merges r25294 from trunk into ruby_1_9_1.
    --
    * include/ruby/ruby.h (RB_GC_GUARD_PTR): workaround for gcc
      optimization.

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

Index: ruby_1_9_1/include/ruby/ruby.h
===================================================================
--- ruby_1_9_1/include/ruby/ruby.h	(revision 26478)
+++ ruby_1_9_1/include/ruby/ruby.h	(revision 26479)
@@ -350,7 +350,13 @@
 
 #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)
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 26478)
+++ ruby_1_9_1/ChangeLog	(revision 26479)
@@ -1,3 +1,10 @@
+Sun Oct 11 09:04:08 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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  <nobu@r...>
 
 	* file.c (path_check_0): prevent from GC.
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 26478)
+++ ruby_1_9_1/version.h	(revision 26479)
@@ -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

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