diff options
| author | ed@FreeBSD.org <ed@FreeBSD.org> | 2017-08-28 09:35:17 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-07-30 10:47:57 +0200 |
| commit | 84e294dc694257d8f3e9b00a4a0651afbf76132a (patch) | |
| tree | fd7ca51362f278d5193dff002061da789935d2fd | |
| parent | 0e5f252bc79f137a7747643dd1bc2693d98c0668 (diff) | |
| download | cygnal-84e294dc694257d8f3e9b00a4a0651afbf76132a.tar.gz cygnal-84e294dc694257d8f3e9b00a4a0651afbf76132a.tar.bz2 cygnal-84e294dc694257d8f3e9b00a4a0651afbf76132a.zip | |
Make _Static_assert() work with GCC in older C++ standards.
GCC only activates C11 keywords in C mode, not C++ mode. This means
that when targeting an older C++ standard, we cannot fall back to using
_Static_assert(). In this case, do define _Static_assert() as a macro
that uses a typedef'ed array.
Discussed in: r322875 commit thread
Reported by: Mark MIllard
MFC after: 1 month
| -rw-r--r-- | newlib/libc/include/sys/cdefs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/newlib/libc/include/sys/cdefs.h b/newlib/libc/include/sys/cdefs.h index b3f8d1965..49be9e062 100644 --- a/newlib/libc/include/sys/cdefs.h +++ b/newlib/libc/include/sys/cdefs.h @@ -314,7 +314,7 @@ #if (defined(__cplusplus) && __cplusplus >= 201103L) || \ __has_extension(cxx_static_assert) #define _Static_assert(x, y) static_assert(x, y) -#elif __GNUC_PREREQ__(4,6) +#elif __GNUC_PREREQ__(4,6) && !defined(__cplusplus) /* Nothing, gcc 4.6 and higher has _Static_assert built-in */ #elif defined(__COUNTER__) #define _Static_assert(x, y) __Static_assert(x, __COUNTER__) |