[libcxxabi] r199860 - Don't redefine static_assert()

[Nick Kledzik]

Author: kledzik
Date: Wed Jan 22 20:08:14 2014
New Revision: 199860

URL: http://llvm.org/viewvc/llvm-project?rev=199860&view=rev
Log:
Don't redefine static_assert()

Modified:
    libcxxabi/trunk/src/Unwind/config.h

Modified: libcxxabi/trunk/src/Unwind/config.h
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/Unwind/config.h?rev=199860&r1=199859&r2=199860&view=diff
==============================================================================
--- libcxxabi/trunk/src/Unwind/config.h (original)
+++ libcxxabi/trunk/src/Unwind/config.h Wed Jan 22 20:08:14 2014
@@ -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 ) );