Differential D9213 Diff 25366 head/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h
Changeset View
Changeset View
Standalone View
Standalone View
head/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h.orig 2014-04-10 20:37:11.000000000 +0200 | |||||
| +++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h 2014-04-24 16:11:40.000000000 +0200 | |||||
| @@ -63,18 +63,10 @@ | |||||
| #if OS(WINDOWS) | |||||
| #include <windows.h> | |||||
| -#elif OS(DARWIN) | |||||
| -#include <libkern/OSAtomic.h> | |||||
| #elif OS(ANDROID) | |||||
| #include <cutils/atomic.h> | |||||
| #elif OS(QNX) | |||||
| #include <atomic.h> | |||||
| -#elif COMPILER(GCC) && !OS(SYMBIAN) | |||||
| -#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) | |||||
| -#include <ext/atomicity.h> | |||||
| -#else | |||||
| -#include <bits/atomicity.h> | |||||
| -#endif | |||||
| #endif | |||||
| namespace WTF { | |||||
| @@ -90,12 +82,6 @@ | |||||
| inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast<long volatile*>(addend)); } | |||||
| #endif | |||||
| -#elif OS(DARWIN) | |||||
| -#define WTF_USE_LOCKFREE_THREADSAFESHARED 1 | |||||
| - | |||||
| -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) | |||||
| inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); } | |||||