summaryrefslogtreecommitdiffstats
path: root/include/cutils
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2011-04-11 20:00:42 -0700
committerCarl Shapiro <cshapiro@google.com>2011-04-11 20:00:42 -0700
commitb60d9ce1fcedf264f7cd7eb9fb8895b118f72ac3 (patch)
tree429007a8a24707eaeb1e5dc6b5de5942bcc701a3 /include/cutils
parent203f9513fd720c091c0bb4289f1c4211aaf1cedc (diff)
downloadcore-b60d9ce1fcedf264f7cd7eb9fb8895b118f72ac3.tar.gz
core-b60d9ce1fcedf264f7cd7eb9fb8895b118f72ac3.tar.bz2
core-b60d9ce1fcedf264f7cd7eb9fb8895b118f72ac3.zip
Make atomic-inline.h usable from ordinary C++ code.
Change-Id: I18dcba9cb3adc22f26403e94df4b2684f51090ed
Diffstat (limited to 'include/cutils')
-rw-r--r--include/cutils/atomic-inline.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/cutils/atomic-inline.h b/include/cutils/atomic-inline.h
index 6acb67cff..49f3e702a 100644
--- a/include/cutils/atomic-inline.h
+++ b/include/cutils/atomic-inline.h
@@ -17,6 +17,10 @@
#ifndef ANDROID_CUTILS_ATOMIC_INLINE_H
#define ANDROID_CUTILS_ATOMIC_INLINE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* Inline declarations and macros for some special-purpose atomic
* operations. These are intended for rare circumstances where a
@@ -61,4 +65,8 @@
#define ANDROID_MEMBAR_STORE android_memory_store_barrier
#endif
+#ifdef __cplusplus
+}
+#endif
+
#endif /* ANDROID_CUTILS_ATOMIC_INLINE_H */