diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 7 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Tue Mar 29 15:03:03 2016 Kenta Murata <mrkn@mrkn.jp> + + * ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P + and HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P on C++. + [ruby-core:72736] [Bug #11962] + Tue Mar 29 14:58:56 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/socket/option.c (inspect_tcpi_msec): more accurate condition diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 14fe7c3e16..60cfb1174e 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -26,6 +26,13 @@ extern "C" { #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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-03-29" -#define RUBY_PATCHLEVEL 21 +#define RUBY_PATCHLEVEL 22 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |