diff options
| author | Nick Kledzik <kledzik@apple.com> | 2014-01-23 02:08:14 +0000 |
|---|---|---|
| committer | Nick Kledzik <kledzik@apple.com> | 2014-01-23 02:08:14 +0000 |
| commit | 8cb8b2086426108c6ea737d83cfd739ae5e5d8d9 (patch) | |
| tree | 2cfd7176d6968f1e5267d2921aaea0a4c8764096 | |
| parent | 65b726605835d1b3947d648497729a4be05dedde (diff) | |
| download | libcxxabi_35a-8cb8b2086426108c6ea737d83cfd739ae5e5d8d9.tar.gz | |
Don't redefine static_assert()
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@199860 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | src/Unwind/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Unwind/config.h b/src/Unwind/config.h index 2b92464..7d7e6bf 100644 --- a/src/Unwind/config.h +++ b/src/Unwind/config.h @@ -20,7 +20,7 @@ #ifndef __has_feature #define __has_feature(__x) 0 #endif -#if !(__has_feature(cxx_static_assert)) +#if !(__has_feature(cxx_static_assert)) && !defined(static_assert) #define static_assert(__b, __m) \ extern int compile_time_assert_failed[ ( __b ) ? 1 : -1 ] \ __attribute__( ( unused ) ); |