Commit 6b4c93f9 authored by hausmann@webkit.org's avatar hausmann@webkit.org

2008-06-20 Ariya Hidayat <ariya.hidayat@trolltech.com>

        Reviewed by Adam Roben.

        Fix compile with MinGW.

        * kjs/Shell.cpp:
        * wtf/Threading.h:
        (WTF::atomicIncrement):
        (WTF::atomicDecrement):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@34757 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 20c85fe3
2008-06-20 Ariya Hidayat <ariya.hidayat@trolltech.com>
Reviewed by Adam Roben.
Fix compile with MinGW.
* kjs/Shell.cpp:
* wtf/Threading.h:
(WTF::atomicIncrement):
(WTF::atomicDecrement):
2008-06-23 Mark Rowe <mrowe@apple.com>
Reviewed by Oliver Hunt.
......
......@@ -58,7 +58,7 @@
#include <signal.h>
#endif
#if PLATFORM(WIN_OS)
#if COMPILER(MSVC)
#include <crtdbg.h>
#include <windows.h>
#endif
......@@ -273,7 +273,7 @@ JSValue* functionQuit(ExecState*, JSObject*, JSValue*, const ArgList&)
// be in a separate main function because the jscmain function requires object
// unwinding.
#if PLATFORM(WIN_OS) && !defined(_DEBUG)
#if COMPILER(MSVC) && !defined(_DEBUG)
#define TRY __try {
#define EXCEPT(x) } __except (EXCEPTION_EXECUTE_HANDLER) { x; }
#else
......
......@@ -171,8 +171,13 @@ private:
#if PLATFORM(WIN_OS) && !COMPILER(MSVC7)
#define WTF_USE_LOCKFREE_THREADSAFESHARED 1
#if COMPILER(MINGW)
inline void atomicIncrement(int* addend) { InterlockedIncrement(reinterpret_cast<long*>(addend)); }
inline int atomicDecrement(int* addend) { return InterlockedDecrement(reinterpret_cast<long*>(addend)); }
#else
inline void atomicIncrement(int volatile* addend) { InterlockedIncrement(reinterpret_cast<long volatile*>(addend)); }
inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast<long volatile*>(addend)); }
#endif
#elif PLATFORM(DARWIN)
#define WTF_USE_LOCKFREE_THREADSAFESHARED 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment