diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-18 18:14:04 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 17:35:28 +0200 |
| commit | 49994fb2ad1dbc66d69b7d5d3418ade4dde7213f (patch) | |
| tree | dfb49a134c6d9e61c3463be8e51c0d9a11d23eb3 /Source | |
| parent | 42dabaf83563a373e8796914c2aa25dc4b54cc13 (diff) | |
| download | qtwebkit-49994fb2ad1dbc66d69b7d5d3418ade4dde7213f.tar.gz | |
Fix build with MingW
Fix wrong export/import flags in inlined methods.
Use normal GCC inline asm instead of _ReadWriteBarrier.
Change-Id: Iba6b923be383777f2807d84349044dbe5a22eb57
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/JavaScriptCore/runtime/Watchdog.h | 4 | ||||
| -rw-r--r-- | Source/WTF/wtf/Atomics.h | 4 | ||||
| -rw-r--r-- | Source/WebKit2/Platform/CoreIPC/Connection.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/Source/JavaScriptCore/runtime/Watchdog.h b/Source/JavaScriptCore/runtime/Watchdog.h index 08c0ccb95..a7b29ef7a 100644 --- a/Source/JavaScriptCore/runtime/Watchdog.h +++ b/Source/JavaScriptCore/runtime/Watchdog.h @@ -54,8 +54,8 @@ public: // This version of didFire() is a more efficient version for when we want // to know if the watchdog has fired in the past, and not whether it should // fire right now. - JS_EXPORT_PRIVATE bool didFire() { return m_didFire; } - JS_EXPORT_PRIVATE void fire(); + bool didFire() { return m_didFire; } + void fire(); void* timerDidFireAddress() { return &m_timerDidFire; } diff --git a/Source/WTF/wtf/Atomics.h b/Source/WTF/wtf/Atomics.h index a12cfd0b4..d7b1597a5 100644 --- a/Source/WTF/wtf/Atomics.h +++ b/Source/WTF/wtf/Atomics.h @@ -65,7 +65,7 @@ #if OS(WINDOWS) #if OS(WINCE) #include <cmnintrin.h> -#else +#elif !COMPILER(GCC) extern "C" void _ReadWriteBarrier(void); #pragma intrinsic(_ReadWriteBarrier) #endif @@ -208,7 +208,7 @@ inline bool weakCompareAndSwapUIntPtr(volatile uintptr_t* location, uintptr_t ex // to do things like register allocation and code motion over pure operations. inline void compilerFence() { -#if OS(WINDOWS) +#if OS(WINDOWS) && !COMPILER(GCC) _ReadWriteBarrier(); #else asm volatile("" ::: "memory"); diff --git a/Source/WebKit2/Platform/CoreIPC/Connection.cpp b/Source/WebKit2/Platform/CoreIPC/Connection.cpp index fa38b4159..b6cdf9325 100644 --- a/Source/WebKit2/Platform/CoreIPC/Connection.cpp +++ b/Source/WebKit2/Platform/CoreIPC/Connection.cpp @@ -350,7 +350,7 @@ PassOwnPtr<MessageEncoder> Connection::createSyncMessageEncoder(StringReference // Encode the sync request ID. COMPILE_ASSERT(sizeof(m_syncRequestID) == sizeof(int64_t), CanUseAtomicIncrement); - syncRequestID = atomicIncrement(reinterpret_cast<int64_t volatile*>(&m_syncRequestID)); + syncRequestID = atomicIncrement(reinterpret_cast<int64_t*>(&m_syncRequestID)); *encoder << syncRequestID; return encoder.release(); diff --git a/Source/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp b/Source/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp index 15a0ed2fd..ac84dab71 100644 --- a/Source/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp +++ b/Source/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp @@ -32,8 +32,6 @@ #include <wtf/text/WTFString.h> #include <wtf/threads/BinarySemaphore.h> -using namespace std; - namespace CoreIPC { // FIXME: Rename this or use a different constant on windows. |