diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-22 19:06:12 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-22 19:06:12 -0400 |
| commit | 1d597e09bd6fa3e654abaf5790d6c18c996828e2 (patch) | |
| tree | 9b0c21995fec48259bf9a46f8938d795e04ef99b | |
| parent | 212dbf678c6c25f17b2e83cf89cf7120fa091591 (diff) | |
| parent | 85cea76ffd430cec08504b3ca340e92556a1ec52 (diff) | |
| download | external_webkit-1d597e09bd6fa3e654abaf5790d6c18c996828e2.zip external_webkit-1d597e09bd6fa3e654abaf5790d6c18c996828e2.tar.gz external_webkit-1d597e09bd6fa3e654abaf5790d6c18c996828e2.tar.bz2 | |
Merge change I85cea76f into eclair-mr2
* changes:
The new WebKit expects atomicIncrement to return int instead of void.
| -rw-r--r-- | JavaScriptCore/wtf/Threading.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/JavaScriptCore/wtf/Threading.h b/JavaScriptCore/wtf/Threading.h index 34d744d..c5e8f2f 100644 --- a/JavaScriptCore/wtf/Threading.h +++ b/JavaScriptCore/wtf/Threading.h @@ -236,7 +236,7 @@ inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Bar #elif defined ANDROID -inline void atomicIncrement(int volatile* addend) { android_atomic_inc(addend); } +inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); } inline int atomicDecrement(int volatile* addend) { return android_atomic_dec(addend); } #elif COMPILER(GCC) && !PLATFORM(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc |