commit ae188c676c681e47a93ade7fdf0144099b470e03
author Carl Shapiro <cshapiro@google.com> Fri Apr 08 13:11:58 2011 -0700
committer Carl Shapiro <cshapiro@google.com> Fri Apr 08 13:11:58 2011 -0700
tree 0d7242995ffc8cfd11e484334786841ddc7bc2b5
parent a72475036290f55cd578dd15f65922dd01fbd3ce

Compile the garbage collector and heap profiler as C++.

Change-Id: I25d8fa821987a3dd6d7109d07fd42dbf2fe0e589

vm/oo/Object.h

diff --git a/vm/oo/Object.h b/vm/oo/Object.h
index b32d5b9..86c0b95 100644
--- a/vm/oo/Object.h
+++ b/vm/oo/Object.h
@@ -21,9 +21,12 @@
 #ifndef _DALVIK_OO_OBJECT
 #define _DALVIK_OO_OBJECT
 
-#include <Atomic.h>
-
 #include <stddef.h>
+#include "Atomic.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* fwd decl */
 struct DataObject;
@@ -779,4 +782,8 @@
 /* debugging */
 void dvmDumpObject(const Object* obj);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*_DALVIK_OO_OBJECT*/