summaryrefslogtreecommitdiffstats
path: root/vm/compiler/Compiler.h
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2011-04-08 13:11:58 -0700
committerCarl Shapiro <cshapiro@google.com>2011-04-08 13:11:58 -0700
commitae188c676c681e47a93ade7fdf0144099b470e03 (patch)
tree0d7242995ffc8cfd11e484334786841ddc7bc2b5 /vm/compiler/Compiler.h
parenta72475036290f55cd578dd15f65922dd01fbd3ce (diff)
downloadandroid_dalvik-ae188c676c681e47a93ade7fdf0144099b470e03.tar.gz
android_dalvik-ae188c676c681e47a93ade7fdf0144099b470e03.tar.bz2
android_dalvik-ae188c676c681e47a93ade7fdf0144099b470e03.zip
Compile the garbage collector and heap profiler as C++.
Change-Id: I25d8fa821987a3dd6d7109d07fd42dbf2fe0e589
Diffstat (limited to 'vm/compiler/Compiler.h')
-rw-r--r--vm/compiler/Compiler.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/vm/compiler/Compiler.h b/vm/compiler/Compiler.h
index 35d34b3e2..384cb1414 100644
--- a/vm/compiler/Compiler.h
+++ b/vm/compiler/Compiler.h
@@ -14,12 +14,16 @@
* limitations under the License.
*/
-#include <Thread.h>
-#include <setjmp.h>
-
#ifndef _DALVIK_VM_COMPILER
#define _DALVIK_VM_COMPILER
+#include <setjmp.h>
+#include "Thread.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* Uncomment the following to enable JIT signature breakpoint
* #define SIGNATURE_BREAKPOINT
@@ -241,4 +245,9 @@ void *dvmCompilerGetInterpretTemplate();
JitInstructionSetType dvmCompilerGetInterpretTemplateSet();
u8 dvmGetRegResourceMask(int reg);
void dvmDumpCFG(struct CompilationUnit *cUnit, const char *dirPrefix);
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _DALVIK_VM_COMPILER */