diff options
| -rw-r--r-- | ext/tk/tcltklib.c | 4 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 2d45f7511b..0798d0b24d 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -20,7 +20,11 @@ #endif #undef RUBY_UNTYPED_DATA_WARNING +#ifdef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P +#define RUBY_UNTYPED_DATA_WARNING 1 +#else #define RUBY_UNTYPED_DATA_WARNING 0 +#endif #ifdef HAVE_RB_THREAD_CHECK_TRAP_PENDING static int rb_thread_critical; /* dummy */ diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 635076fb13..884042a291 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1173,6 +1173,15 @@ rb_data_object_alloc_warning(VALUE klass, void *ptr, RUBY_DATA_FUNC mark, RUBY_D return rb_data_object_alloc(klass, ptr, mark, free); } +#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) +#define rb_data_object_alloc_warning(klass, ptr, mark, free) \ + __extension__( \ + __builtin_choose_expr( \ + __builtin_constant_p(klass) && !(klass), \ + rb_data_object_alloc(klass, ptr, mark, free), \ + rb_data_object_alloc_warning(klass, ptr, mark, free))) +#endif + static inline void * rb_data_object_get(VALUE obj) { |