diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 12:28:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 12:28:13 (GMT) |
| commit | be2f020ada5cc52f91208d82b701958582b109b2 (patch) | |
| tree | 00132753f6dc57b8f9379348b1ccee588a27f559 /src/3rdparty/javascriptcore/JavaScriptCore | |
| parent | 78b2e9421c47371b68f4c65a181a077ba3a226ac (diff) | |
| parent | a34c82bb5a0a0e6c2bdccfef5fb31e7a0667c906 (diff) | |
| download | Qt-be2f020ada5cc52f91208d82b701958582b109b2.zip Qt-be2f020ada5cc52f91208d82b701958582b109b2.tar.gz Qt-be2f020ada5cc52f91208d82b701958582b109b2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Use libusb to auto-detect the port to use to communicate with the phone
Whitespace
Make multimedia only depend on opengl when the latter is build
gcc for Symbian doesn't support gcc extensions like atomicity.h - disable
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h index 1599562..5fb7fe3 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h @@ -75,7 +75,7 @@ #include <libkern/OSAtomic.h> #elif OS(ANDROID) #include <cutils/atomic.h> -#elif COMPILER(GCC) +#elif COMPILER(GCC) && !PLATFORM(SYMBIAN) #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) #include <ext/atomicity.h> #else @@ -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) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc +#elif COMPILER(GCC) && !PLATFORM(SPARC64) && !PLATFORM(SYMBIAN) // 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; } |