diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-09 02:40:12 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-09 02:40:12 +0000 |
commit | 9930481a239fa7182429f3c3942ea033fb9b0320 (patch) | |
tree | 91ac1b6cbb1b8f8d4fba27be41b2c30cbf5f563f /configure.ac | |
parent | 784fdba37c07e1a1fa7eb2bb13f914bfe363920d (diff) | |
download | ruby-9930481a239fa7182429f3c3942ea033fb9b0320.tar.gz |
Prefer alignof() over _Alignof()
to allow C++ programs include <ruby.h>. [Bug #14668]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 2c0fc2ae07..5b21e47c88 100644 --- a/configure.ac +++ b/configure.ac @@ -984,6 +984,7 @@ AC_CHECK_HEADERS(net/socket.h) AC_CHECK_HEADERS(process.h) AC_CHECK_HEADERS(pwd.h) AC_CHECK_HEADERS(setjmpex.h) +AC_CHECK_HEADERS(stdalign.h) AC_CHECK_HEADERS(sys/attr.h) AC_CHECK_HEADERS(sys/fcntl.h) AC_CHECK_HEADERS(sys/file.h) @@ -1279,13 +1280,16 @@ AC_CACHE_CHECK([for alignof() syntax], rb_cv_have_alignof,[ rb_cv_have_alignof=no RUBY_WERROR_FLAG([ for expr in \ - "_Alignof" \ "alignof" \ + "_Alignof" \ "__alignof" \ "__alignof__" \ ; do - AC_TRY_COMPILE([],[return (int)$expr(int);], + AC_TRY_COMPILE([ + @%:@ifdef HAVE_STDALIGN_H + @%:@include <stdalign.h> + @%:@endif],[return (int)$expr(int);], [rb_cv_have_alignof="$expr"; break], []) done ])]) |