summaryrefslogtreecommitdiffstats
path: root/libcutils
diff options
context:
space:
mode:
authorHans Boehm <hboehm@google.com>2014-10-03 23:59:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-03 23:59:04 +0000
commitf5204549faf7310cc808bcb3676fb36268178e26 (patch)
treecdcb790c01cfd753ae620504ae9bd43ecf9cfae7 /libcutils
parent2124b521e86ee778880eb42cd40c5820d625890e (diff)
parent028928fe3ca42b7aab55cb49f2784caeec025a12 (diff)
downloadsystem_core-f5204549faf7310cc808bcb3676fb36268178e26.zip
system_core-f5204549faf7310cc808bcb3676fb36268178e26.tar.gz
system_core-f5204549faf7310cc808bcb3676fb36268178e26.tar.bz2
am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
* commit '028928fe3ca42b7aab55cb49f2784caeec025a12': Rewrite atomic.h to use stdatomic.h.
Diffstat (limited to 'libcutils')
-rw-r--r--libcutils/atomic.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libcutils/atomic.c b/libcutils/atomic.c
index 1484ef8..d34aa00 100644
--- a/libcutils/atomic.c
+++ b/libcutils/atomic.c
@@ -14,6 +14,13 @@
* limitations under the License.
*/
+/*
+ * Generate non-inlined versions of android_atomic functions.
+ * Nobody should be using these, but some binary blobs currently (late 2014)
+ * are.
+ * If you read this in 2015 or later, please try to delete this file.
+ */
+
#define ANDROID_ATOMIC_INLINE
-#include <cutils/atomic-inline.h>
+#include <cutils/atomic.h>