diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-10-30 18:34:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-30 18:34:08 +0000 |
| commit | bb3b5843b772483a6c6a053f68b4c80d9e197a06 (patch) | |
| tree | eed8f795578786c113abffab5e9c93375fb26c6f /9 | |
| parent | 74db65e4eb138d90293b80dd274203462f8387bf (diff) | |
| parent | 14884c6ea0394acf1f77aca9fa1ca2d917e7536c (diff) | |
| download | prebuilts_ndk-bb3b5843b772483a6c6a053f68b4c80d9e197a06.zip prebuilts_ndk-bb3b5843b772483a6c6a053f68b4c80d9e197a06.tar.gz prebuilts_ndk-bb3b5843b772483a6c6a053f68b4c80d9e197a06.tar.bz2 | |
Merge "Cherry-pick: Only use <atomic> for C++11 and newer"
Diffstat (limited to '9')
6 files changed, 6 insertions, 6 deletions
diff --git a/9/platforms/android-21/arch-arm/usr/include/stdatomic.h b/9/platforms/android-21/arch-arm/usr/include/stdatomic.h index bcea859..58cb1bc 100644 --- a/9/platforms/android-21/arch-arm/usr/include/stdatomic.h +++ b/9/platforms/android-21/arch-arm/usr/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 diff --git a/9/platforms/android-21/arch-arm64/usr/include/stdatomic.h b/9/platforms/android-21/arch-arm64/usr/include/stdatomic.h index bcea859..58cb1bc 100644 --- a/9/platforms/android-21/arch-arm64/usr/include/stdatomic.h +++ b/9/platforms/android-21/arch-arm64/usr/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 diff --git a/9/platforms/android-21/arch-mips/usr/include/stdatomic.h b/9/platforms/android-21/arch-mips/usr/include/stdatomic.h index bcea859..58cb1bc 100644 --- a/9/platforms/android-21/arch-mips/usr/include/stdatomic.h +++ b/9/platforms/android-21/arch-mips/usr/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 diff --git a/9/platforms/android-21/arch-mips64/usr/include/stdatomic.h b/9/platforms/android-21/arch-mips64/usr/include/stdatomic.h index bcea859..58cb1bc 100644 --- a/9/platforms/android-21/arch-mips64/usr/include/stdatomic.h +++ b/9/platforms/android-21/arch-mips64/usr/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 diff --git a/9/platforms/android-21/arch-x86/usr/include/stdatomic.h b/9/platforms/android-21/arch-x86/usr/include/stdatomic.h index bcea859..58cb1bc 100644 --- a/9/platforms/android-21/arch-x86/usr/include/stdatomic.h +++ b/9/platforms/android-21/arch-x86/usr/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 diff --git a/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h b/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h index bcea859..58cb1bc 100644 --- a/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h +++ b/9/platforms/android-21/arch-x86_64/usr/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 |