summaryrefslogtreecommitdiffstats
path: root/9/platforms/android-21/arch-arm
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2014-10-30 10:42:46 -0700
committerAndrew Hsieh <andrewhsieh@google.com>2014-10-30 10:44:31 -0700
commit14884c6ea0394acf1f77aca9fa1ca2d917e7536c (patch)
treeeed8f795578786c113abffab5e9c93375fb26c6f /9/platforms/android-21/arch-arm
parent74db65e4eb138d90293b80dd274203462f8387bf (diff)
downloadprebuilts_ndk-14884c6ea0394acf1f77aca9fa1ca2d917e7536c.zip
prebuilts_ndk-14884c6ea0394acf1f77aca9fa1ca2d917e7536c.tar.gz
prebuilts_ndk-14884c6ea0394acf1f77aca9fa1ca2d917e7536c.tar.bz2
Cherry-pick: Only use <atomic> for C++11 and newer
See bionic 3ce0769aa5f9a991af1d167f730d987dd002253c BUG=17736764 Change-Id: I275c2db726778e4f403a08e670b954ad0b607376
Diffstat (limited to '9/platforms/android-21/arch-arm')
-rw-r--r--9/platforms/android-21/arch-arm/usr/include/stdatomic.h2
1 files changed, 1 insertions, 1 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