nagachika	2016-03-28 23:18:47 +0900 (Mon, 28 Mar 2016)

  New Revision: 54315

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

  Log:
    merge revision(s) 53455: [Backport #11962]
    
    * 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 directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/include/ruby/ruby.h
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54314)
+++ ruby_2_2/version.h	(revision 54315)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
-#define RUBY_RELEASE_DATE "2016-03-24"
-#define RUBY_PATCHLEVEL 257
+#define RUBY_RELEASE_DATE "2016-03-28"
+#define RUBY_PATCHLEVEL 258
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_DAY 28
 
 #include "ruby/version.h"
 
Index: ruby_2_2/include/ruby/ruby.h
===================================================================
--- ruby_2_2/include/ruby/ruby.h	(revision 54314)
+++ ruby_2_2/include/ruby/ruby.h	(revision 54315)
@@ -26,6 +26,13 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/ruby_2_2/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: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54314)
+++ ruby_2_2/ChangeLog	(revision 54315)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Mar 28 23:15:54 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 Mar 24 20:39:58 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/socket/option.c (inspect_tcpi_msec): more accurate condition

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53455


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