diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-03-30 11:04:01 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-03-30 11:04:01 (GMT) |
| commit | ff968f44124322f5cda47cc7eced79ccaf23de80 (patch) | |
| tree | e957f1a602b1518aba9a24fb4553b18b6b85a8ec /src/3rdparty/javascriptcore/JavaScriptCore/wtf | |
| parent | 2d9260e863ff2e3a5bb77d37b2b9b90072bce825 (diff) | |
| parent | 08072b17a19bf9a99fbc8a494baa5528725fec1a (diff) | |
| download | Qt-ff968f44124322f5cda47cc7eced79ccaf23de80.zip Qt-ff968f44124322f5cda47cc7eced79ccaf23de80.tar.gz Qt-ff968f44124322f5cda47cc7eced79ccaf23de80.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/wtf')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h index 5b655e8..85c8743 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h @@ -239,7 +239,7 @@ inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Bar 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) && !defined(__SYMBIAN32__) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc +#elif COMPILER(GCC) && !CPU(SPARC64) && !defined(__SYMBIAN32__) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc #define WTF_USE_LOCKFREE_THREADSAFESHARED 1 inline int atomicIncrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; } |