Title: [141468] trunk/Source/WebCore
Revision
141468
Author
[email protected]
Date
2013-01-31 12:52:29 -0800 (Thu, 31 Jan 2013)

Log Message

Use OS() and PLATFORM() macros in WebCorePrefix.h for readability
<http://webkit.org/b/108374>

Reviewed by Laszlo Gombos.

* WebCorePrefix.h: Replaced all possible checks with OS() or
PLATFORM() macros other than __APPLE__.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (141467 => 141468)


--- trunk/Source/WebCore/ChangeLog	2013-01-31 20:51:09 UTC (rev 141467)
+++ trunk/Source/WebCore/ChangeLog	2013-01-31 20:52:29 UTC (rev 141468)
@@ -1,3 +1,13 @@
+2013-01-31  David Kilzer  <[email protected]>
+
+        Use OS() and PLATFORM() macros in WebCorePrefix.h for readability
+        <http://webkit.org/b/108374>
+
+        Reviewed by Laszlo Gombos.
+
+        * WebCorePrefix.h: Replaced all possible checks with OS() or
+        PLATFORM() macros other than __APPLE__.
+
 2013-01-31  Mike West  <[email protected]>
 
         Cleanup: Use ScriptExecutionContext::topOrigin when relevant.

Modified: trunk/Source/WebCore/WebCorePrefix.h (141467 => 141468)


--- trunk/Source/WebCore/WebCorePrefix.h	2013-01-31 20:51:09 UTC (rev 141467)
+++ trunk/Source/WebCore/WebCorePrefix.h	2013-01-31 20:52:29 UTC (rev 141468)
@@ -37,7 +37,7 @@
 #endif
 #endif
 
-#if defined(WIN32) || defined(_WIN32)
+#if OS(WINDOWS)
 
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0502
@@ -47,7 +47,7 @@
 #define WINVER 0x0502
 #endif
 
-#ifndef WTF_USE_CURL
+#if !USE(CURL)
 #ifndef _WINSOCKAPI_
 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
 #endif
@@ -64,7 +64,7 @@
 
 #include <pthread.h>
 
-#endif // defined(WIN32) || defined(_WIN32)
+#endif // OS(WINDOWS)
 
 #include <sys/types.h>
 #include <fcntl.h>
@@ -74,7 +74,7 @@
 
 // On Linux this causes conflicts with libpng because there are two impls. of
 // longjmp - see here: https://bugs.launchpad.net/ubuntu/+source/libpng/+bug/218409
-#ifndef BUILDING_WX__
+#if !PLATFORM(WX)
 #include <setjmp.h>
 #endif
 
@@ -132,14 +132,14 @@
 #include <sys/resource.h>
 #endif
 
-#if !defined(BUILDING_WX__)
+#if !PLATFORM(WX)
 #include <CoreFoundation/CoreFoundation.h>
-#ifdef WTF_PLATFORM_WIN_CAIRO
+#if PLATFORM(WIN_CAIRO)
 #include <ConditionalMacros.h>
 #include <windows.h>
 #else
 
-#if defined(WIN32) || defined(_WIN32)
+#if OS(WINDOWS)
 // FIXME <rdar://problem/8208868> Remove support for obsolete ColorSync API, CoreServices header in CoreGraphics
 // We can remove this once the new ColorSync APIs are available in an internal Safari SDK.
 #include <ColorSync/ColorSync.h>
@@ -155,10 +155,10 @@
 #if !PLATFORM(IOS)
 #include <CoreServices/CoreServices.h>
 #endif // !PLATFORM(IOS)
-#endif // defined(WIN32) || defined(_WIN32)
+#endif // OS(WINDOWS)
 
 #endif
-#endif // !defined(BUILDING_WX__)
+#endif // !PLATFORM(WX)
 
 #ifdef __OBJC__
 #if PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to