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/Atomic.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/Atomic.h')
| -rw-r--r-- | vm/Atomic.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vm/Atomic.h b/vm/Atomic.h index 6c3a66f6b..713c5b4cc 100644 --- a/vm/Atomic.h +++ b/vm/Atomic.h @@ -23,6 +23,10 @@ #include <cutils/atomic.h> /* use common Android atomic ops */ #include <cutils/atomic-inline.h> /* and some uncommon ones */ +#ifdef __cplusplus +extern "C" { +#endif + /* * NOTE: Two "quasiatomic" operations on the exact same memory address * are guaranteed to operate atomically with respect to each other, @@ -52,4 +56,8 @@ int64_t dvmQuasiAtomicRead64(volatile const int64_t* addr); int dvmQuasiAtomicCas64(int64_t oldvalue, int64_t newvalue, volatile int64_t* addr); +#ifdef __cplusplus +} +#endif + #endif /*_DALVIK_ATOMIC*/ |