am 3b32ba0e: am 6bfcefe0: Merge "Undefine _Atomic before redefining"

* commit '3b32ba0e2c1851e20f72a73c606dcbfc79e687bb': Undefine _Atomic before redefining
2014-08-27 00:11:45 +00:00
parent e294a02c0c 3b32ba0e2c
commit c0c0e0404f
1 changed files with 7 additions and 0 deletions
--- a/libc/include/stdatomic.h
+++ b/libc/include/stdatomic.h
@@ -39,6 +39,13 @@

 #include <atomic>

+#undef _Atomic
+        /* Also defined by <atomic> for gcc.  But not used in macros. */
+        /* Also a clang intrinsic.                                    */
+        /* Should not be used by client code before this file is      */
+        /* included.  The definitions in <atomic> themselves see      */
+        /* the old definition, as they should.                        */
+        /* Client code sees the following definition.                 */
 #define _Atomic(t) std::atomic<t>

 using std::atomic_is_lock_free;