From c7988fd29d851cadf77cff865ce0af6e51dc9374 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 16 Mar 2015 07:49:27 +0000
Subject: [PATCH] ruby.h: suppress false warnings

* include/ruby/ruby.h (rb_data_object_alloc_warning): enable only
  if __builtin_choose_expr works with __builtin_constant_p so that
  warnings will be suppressed if klass is 0.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49978 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 include/ruby/ruby.h | 2 ++
 random.c            | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 32a6d23b2e..351766a111 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1169,7 +1169,9 @@ rb_obj_freeze_inline(VALUE x)
 # define RUBY_UNTYPED_DATA_FUNC(func) DEPRECATED(func)
 #endif
 
+#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P)
 RUBY_UNTYPED_DATA_FUNC(static inline VALUE rb_data_object_alloc_warning(VALUE,void*,RUBY_DATA_FUNC,RUBY_DATA_FUNC));
+#endif
 RUBY_UNTYPED_DATA_FUNC(static inline void *rb_data_object_get_warning(VALUE));
 
 static inline VALUE
diff --git a/random.c b/random.c
index 99e309dbd2..fed85e0a47 100644
--- a/random.c
+++ b/random.c
@@ -491,8 +491,6 @@ fill_random_bytes(void *seed, size_t size)
 	}
 	else {
 	    if (!old_prov) {
-# undef RUBY_UNTYPED_DATA_WARNING
-# define RUBY_UNTYPED_DATA_WARNING 0
 		rb_gc_register_mark_object(Data_Wrap_Struct(0, 0, release_crypt, &prov));
 	    }
 	    else {