1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P

Browse Source 
and HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P on C++.
  [ruby-core:72736] [Bug #11962]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mrkn 2016-01-07 13:35:32 +00:00
parent 9f44b77a18
commit 98e565ec78
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Jan 7 22:32:21 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]
Thu Jan 7 22:02:21 2016 Shugo Maeda <shugo@ruby-lang.org> Thu Jan 7 22:02:21 2016 Shugo Maeda <shugo@ruby-lang.org>
* enum.c (enum_minmax): optimize object comparison in * enum.c (enum_minmax): optimize object comparison in

7
include/ruby/ruby.h
View File

@ -26,6 +26,13 @@ extern "C" {
#include RUBY_EXTCONF_H #include RUBY_EXTCONF_H
#endif #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" #include "defines.h"
#define NORETURN_STYLE_NEW 1 #define NORETURN_STYLE_NEW 1