From b60d9ce1fcedf264f7cd7eb9fb8895b118f72ac3 Mon Sep 17 00:00:00 2001
From: Carl Shapiro <cshapiro@google.com>
Date: Mon, 11 Apr 2011 20:00:42 -0700
Subject: [PATCH] Make atomic-inline.h usable from ordinary C++ code.

Change-Id: I18dcba9cb3adc22f26403e94df4b2684f51090ed
---
 include/cutils/atomic-inline.h | 8 ++++++++
 1 file changed, 8 insertions(+)

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 */