mrkn	2016-01-07 22:35:32 +0900 (Thu, 07 Jan 2016)

  New Revision: 53455

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53455

  Log:
    * ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
      and HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P on C++.
      [ruby-core:72736] [Bug #11962]

  Modified files:
    trunk/ChangeLog
    trunk/include/ruby/ruby.h
Index: include/ruby/ruby.h
===================================================================
--- include/ruby/ruby.h	(revision 53454)
+++ include/ruby/ruby.h	(revision 53455)
@@ -26,6 +26,13 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/include/ruby/ruby.h#L26
 #include RUBY_EXTCONF_H
 #endif
 
+#if defined(__cplusplus)
+/* __builtin_choose_expr and __builtin_types_compatible aren't available
+ * on C++.  See https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html */
+# undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
+# undef HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P
+#endif
+
 #include "defines.h"
 
 #define NORETURN_STYLE_NEW 1
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 53454)
+++ ChangeLog	(revision 53455)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Jan  7 22:32:21 2016  Kenta Murata  <mrkn@m...>
+
+	* ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
+	  and HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P on C++.
+	  [ruby-core:72736] [Bug #11962]
+
 Thu Jan  7 22:02:21 2016  Shugo Maeda  <shugo@r...>
 
 	* enum.c (enum_minmax): optimize object comparison in

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