From: paroga@webkit.org Date: Tue, 21 Feb 2012 18:24:05 +0000 (+0000) Subject: Unnecessary preprocessor macros in MainThread.h/cpp X-Git-Tag: 070512121124~12280 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8a112bcb17e06a1541dc1645f3da443855b434b;p=profile%2Fivi%2Fwebkit-efl.git Unnecessary preprocessor macros in MainThread.h/cpp https://bugs.webkit.org/show_bug.cgi?id=79083 Removed invalid/wrong PLATFORM(WINDOWS) preprocessor macro. Patch by Roland Takacs on 2012-02-21 * wtf/MainThread.cpp: (WTF): * wtf/MainThread.h: (WTF): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108369 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index c445f91..b0f4e0a 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,15 @@ +2012-02-21 Roland Takacs + + Unnecessary preprocessor macros in MainThread.h/cpp + https://bugs.webkit.org/show_bug.cgi?id=79083 + + Removed invalid/wrong PLATFORM(WINDOWS) preprocessor macro. + + * wtf/MainThread.cpp: + (WTF): + * wtf/MainThread.h: + (WTF): + 2012-02-21 Sam Weinig Attempt to fix the Snow Leopard build. diff --git a/Source/JavaScriptCore/wtf/MainThread.cpp b/Source/JavaScriptCore/wtf/MainThread.cpp index 4ac9f18..f8686aa 100644 --- a/Source/JavaScriptCore/wtf/MainThread.cpp +++ b/Source/JavaScriptCore/wtf/MainThread.cpp @@ -281,7 +281,7 @@ bool isMainThreadOrGCThread() return isMainThread(); } -#elif PLATFORM(MAC) || PLATFORM(WINDOWS) +#elif PLATFORM(MAC) // This is necessary because JavaScriptCore.exp doesn't support preprocessor macros. bool isMainThreadOrGCThread() { diff --git a/Source/JavaScriptCore/wtf/MainThread.h b/Source/JavaScriptCore/wtf/MainThread.h index 2c6e9bc..4839c81 100644 --- a/Source/JavaScriptCore/wtf/MainThread.h +++ b/Source/JavaScriptCore/wtf/MainThread.h @@ -58,7 +58,7 @@ void initializeGCThreads(); #if ENABLE(PARALLEL_GC) void registerGCThread(); WTF_EXPORT_PRIVATE bool isMainThreadOrGCThread(); -#elif PLATFORM(MAC) || PLATFORM(WINDOWS) +#elif PLATFORM(MAC) WTF_EXPORT_PRIVATE bool isMainThreadOrGCThread(); #else inline bool isMainThreadOrGCThread() { return isMainThread(); }