summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/javascriptcore/JavaScriptCore
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-21 13:39:27 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-21 13:39:27 (GMT)
commit9dbba618af3b505c0aac590d0b0ec32eabb76d76 (patch)
tree9de626bea521d94c6e2a418d86d1934c067e8e7c /src/3rdparty/javascriptcore/JavaScriptCore
parent55fb13a62a531a7400f8dc602fde5f2529aaaad4 (diff)
parentaea135e1b1dad919229c9bfde248f8bb615c3c5d (diff)
downloadQt-9dbba618af3b505c0aac590d0b0ec32eabb76d76.zip
Qt-9dbba618af3b505c0aac590d0b0ec32eabb76d76.tar.gz
Qt-9dbba618af3b505c0aac590d0b0ec32eabb76d76.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: Moved QMAKE_MOC etc. variable declarations after symbian.conf inclusion 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.h4
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; }