summaryrefslogtreecommitdiffstats
path: root/libcutils
diff options
context:
space:
mode:
authorHans Boehm <hboehm@google.com>2014-10-04 00:06:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-04 00:06:45 +0000
commit954fc61b6befd70e9088862c21a601f06881ba43 (patch)
treeaec617d592fcf68090cccc2c4ebcf411033bdd01 /libcutils
parent801f7e6fd960d73a9da00166ae6a3aaddc73934e (diff)
parentf5204549faf7310cc808bcb3676fb36268178e26 (diff)
downloadcore-954fc61b6befd70e9088862c21a601f06881ba43.tar.gz
core-954fc61b6befd70e9088862c21a601f06881ba43.tar.bz2
core-954fc61b6befd70e9088862c21a601f06881ba43.zip
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 1484ef890..d34aa0081 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>