diff options
| author | Carl Shapiro <cshapiro@google.com> | 2011-04-08 13:11:58 -0700 |
|---|---|---|
| committer | Carl Shapiro <cshapiro@google.com> | 2011-04-08 13:11:58 -0700 |
| commit | ae188c676c681e47a93ade7fdf0144099b470e03 (patch) | |
| tree | 0d7242995ffc8cfd11e484334786841ddc7bc2b5 /vm/oo/Object.h | |
| parent | a72475036290f55cd578dd15f65922dd01fbd3ce (diff) | |
| download | android_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/oo/Object.h')
| -rw-r--r-- | vm/oo/Object.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/vm/oo/Object.h b/vm/oo/Object.h index b32d5b92e..86c0b95f9 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 @@ INLINE u4 dvmGetMethodInsnsSize(const Method* meth) { /* debugging */ void dvmDumpObject(const Object* obj); +#ifdef __cplusplus +} +#endif + #endif /*_DALVIK_OO_OBJECT*/ |