summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--include/ruby/ruby.h8
-rw-r--r--version.h2
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 <nobu@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* 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