diff options
| author | BogDan Vatra <bogdan@kde.org> | 2013-03-26 19:33:38 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-02 13:22:05 +0200 |
| commit | 5d5f61912d4352e58d58fe8cf5fe1dd58b04b9e5 (patch) | |
| tree | b0679415e6bfbd554d382f65a371d0a1f13b54c4 /src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | |
| parent | a5116f19e540387fe0653364bbbd9a662bc67b7a (diff) | |
| download | qtscript-5d5f61912d4352e58d58fe8cf5fe1dd58b04b9e5.tar.gz | |
Fix compile on Android
Change-Id: Ide8d4a50169de13e9743f3b2304af2b23c3ce694
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h')
| -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 8b76c0f..d1944a5 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h @@ -73,7 +73,7 @@ #include <windows.h> #elif OS(DARWIN) #include <libkern/OSAtomic.h> -#elif OS(ANDROID) +#elif OS(ANDROID) && !PLATFORM(QT) #include <cutils/atomic.h> #elif OS(QNX) #include <atomic.h> @@ -236,7 +236,7 @@ inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(r inline int atomicIncrement(int volatile* addend) { return OSAtomicIncrement32Barrier(const_cast<int*>(addend)); } inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); } -#elif OS(ANDROID) +#elif OS(ANDROID) && !PLATFORM(QT) inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); } inline int atomicDecrement(int volatile* addend) { return android_atomic_dec(addend); } |