am c16f0486: resolved conflicts for merge of 2b10e2f1 to lmp-dev-plus-aosp

* commit 'c16f0486fca0df1125cc381d3f4ef3b652d72d29': Undefine _Atomic before redefining
2014-09-03 09:12:50 +00:00
parent 763d17e22f c16f0486fc
commit 4e092df34a
1 changed files with 0 additions and 1 deletions
--- a/libc/include/stdatomic.h
+++ b/libc/include/stdatomic.h
@@ -58,7 +58,6 @@
        /* 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;