diff options
| author | Carl Shapiro <cshapiro@google.com> | 2011-04-27 23:00:01 -0700 |
|---|---|---|
| committer | Carl Shapiro <cshapiro@google.com> | 2011-04-27 23:00:01 -0700 |
| commit | d862faa2ceae186da5518607505eb942d634ced9 (patch) | |
| tree | 3854638a1851457b5f895fc6c39fa032fd90c6f9 /vm/Atomic.h | |
| parent | 5cdd4a3f91d3fc25c8eeca8f58e35bb6c4e908ca (diff) | |
| download | android_dalvik-d862faa2ceae186da5518607505eb942d634ced9.tar.gz android_dalvik-d862faa2ceae186da5518607505eb942d634ced9.tar.bz2 android_dalvik-d862faa2ceae186da5518607505eb942d634ced9.zip | |
Get rid of uneeded extern, enum, typedef and struct qualifiers.
Change-Id: I236c5a1553a51f82c9bc3eaaab042046c854d3b4
Diffstat (limited to 'vm/Atomic.h')
| -rw-r--r-- | vm/Atomic.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/vm/Atomic.h b/vm/Atomic.h index 713c5b4cc..9d4333264 100644 --- a/vm/Atomic.h +++ b/vm/Atomic.h @@ -23,10 +23,6 @@ #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, @@ -42,12 +38,12 @@ extern "C" { * Swap the 64-bit value at "addr" with "value". Returns the previous * value. */ -int64_t dvmQuasiAtomicSwap64(int64_t value, volatile int64_t* addr); +extern "C" int64_t dvmQuasiAtomicSwap64(int64_t value, volatile int64_t* addr); /* * Read the 64-bit value at "addr". */ -int64_t dvmQuasiAtomicRead64(volatile const int64_t* addr); +extern "C" int64_t dvmQuasiAtomicRead64(volatile const int64_t* addr); /* * If the value at "addr" is equal to "oldvalue", replace it with "newvalue" @@ -56,8 +52,4 @@ 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*/ |