commit | 13baf92d93c17e0b939a30ef4821a374faf037fe | [log] [tgz] |
---|---|---|
author | The Android Automerger <android-build@google.com> | Sat Nov 01 06:09:02 2014 -0700 |
committer | The Android Automerger <android-build@google.com> | Sat Nov 01 06:09:02 2014 -0700 |
tree | 6f5bcdb04b85c90b94628befafa4f5c9aef2b8fa | |
parent | 653263a96459c5c1811623bd84201c324a870280 [diff] | |
parent | 09fa97fd17c05c20b41aeed95d8e68e9add8e154 [diff] |
merge in lmp-mr1-release history after reset to 653263a96459c5c1811623bd84201c324a870280
diff --git a/libc/include/stdatomic.h b/libc/include/stdatomic.h index bcea859..58cb1bc 100644 --- a/libc/include/stdatomic.h +++ b/libc/include/stdatomic.h
@@ -33,7 +33,7 @@ #include <sys/cdefs.h> -#if defined(__cplusplus) && defined(_USING_LIBCXX) +#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX) # ifdef __clang__ # if __has_feature(cxx_atomic) # define _STDATOMIC_HAVE_ATOMIC