summaryrefslogtreecommitdiffstats
path: root/libcutils
diff options
context:
space:
mode:
authorHans Boehm <hboehm@google.com>2014-10-04 00:06:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-04 00:06:30 +0000
commit2ac8207e505ff645c8fe9416da689f12dd73f68e (patch)
treefd0a945ab4df763055d4788c7a48df537333c6ed /libcutils
parentd8e138396a97b0d05c08d31df38f2c6a2ff52e2e (diff)
parentf5204549faf7310cc808bcb3676fb36268178e26 (diff)
downloadsystem_core-2ac8207e505ff645c8fe9416da689f12dd73f68e.zip
system_core-2ac8207e505ff645c8fe9416da689f12dd73f68e.tar.gz
system_core-2ac8207e505ff645c8fe9416da689f12dd73f68e.tar.bz2
am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
* commit 'f5204549faf7310cc808bcb3676fb36268178e26': 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>