diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-28 18:16:04 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-28 18:16:04 +0000 |
| commit | 95bfac2e21ea3acb3903d05ff3909028af4a340f (patch) | |
| tree | 8435ae96827b9433c9794aa769500c773809cff8 /internal.h | |
| parent | aad72320354dd5893e49b91952789c5163beb6b2 (diff) | |
merge revision(s) 51242: [Backport #11343]
* gc.c (__has_feature): move into internal.h.
* internal.h (__has_feature): ditto.
* internal.h (__has_extension): new macro.
* internal.h (STATIC_ASSERT): use _Static_assert with
clang. [ruby-core:69931] [Bug #11343]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'internal.h')
| -rw-r--r-- | internal.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/internal.h b/internal.h index 9161122732..1783405bd2 100644 --- a/internal.h +++ b/internal.h @@ -73,7 +73,15 @@ extern "C" { (__GNUC__ == (major) && __GNUC_MINOR__ > (minor)) || \ (__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ >= (patchlevel)))) -#if GCC_VERSION_SINCE(4, 6, 0) +#ifndef __has_feature +# define __has_feature(x) 0 +#endif + +#ifndef __has_extension +# define __has_extension __has_feature +#endif + +#if GCC_VERSION_SINCE(4, 6, 0) || __has_extension(c_static_assert) # define STATIC_ASSERT(name, expr) _Static_assert(expr, #name ": " #expr) #else # define STATIC_ASSERT(name, expr) typedef int static_assert_##name##_check[1 - 2*!(expr)] |