diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 6 |
2 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Jun 29 01:41:42 2010 Masaya Tarui <tarui@ruby-lnag.org> + + * include/ruby/ruby.h (static inline rb_gc_guarded_ptr): prevent + RB_GC_GUARD_PTR being removed by optimization. + Tue Jun 29 01:22:08 2010 Aaron Patterson <aaron@tenderlovemaking.com> * ext/fiddle/fiddle.h: added FFI type detection to avoid bug in ffi diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 7c6e35bd14..ff4912847e 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -420,7 +420,13 @@ static inline int rb_type(VALUE obj); #define RB_GC_GUARD_PTR(ptr) \ __extension__ ({volatile VALUE *rb_gc_guarded_ptr = (ptr); rb_gc_guarded_ptr;}) #else +#ifdef _MSC_VER +#pragma optimize("", off) +#endif static inline volatile VALUE *rb_gc_guarded_ptr(volatile VALUE *ptr) {return ptr;} +#ifdef _MSC_VER +#pragma optimize("", on) +#endif #define RB_GC_GUARD_PTR(ptr) rb_gc_guarded_ptr(ptr) #endif #define RB_GC_GUARD(v) (*RB_GC_GUARD_PTR(&(v))) |