Changeset 140988 in webkit

Timestamp:

Jan 28, 2013 11:56:41 AM (11 years ago)

Author:

ddkilzer@apple.com

Message:

BUILD FIX: Platform.h:1212:22: error: 'MAC_OS_X_VERSION_MIN_REQUIRED' is not defined, evaluates to 0 [-Werror,-Wundef]

This fixes the following build error introduced in r140366 for
Bug 107098:

Platform.h:1212:22: error: 'MAC_OS_X_VERSION_MIN_REQUIRED' is not defined, evaluates to 0 [-Werror,-Wundef]
#if PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !PLATFORM(IOS)

1 error generated.

• wtf/Platform.h: Check !PLATFORM(IOS) first so that iOS builds

do not try to evaluate MAC_OS_X_VERSION_MIN_REQUIRED.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Platform.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-01-28  David Kilzer  <ddkilzer@apple.com>
+
+        BUILD FIX: Platform.h:1212:22: error: '__MAC_OS_X_VERSION_MIN_REQUIRED' is not defined, evaluates to 0 [-Werror,-Wundef]
+
+        This fixes the following build error introduced in r140366 for
+        Bug 107098:
+
+            Platform.h:1212:22: error: '__MAC_OS_X_VERSION_MIN_REQUIRED' is not defined, evaluates to 0 [-Werror,-Wundef]
+            #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !PLATFORM(IOS)
+                                 ^
+            1 error generated.
+
+        * wtf/Platform.h: Check !PLATFORM(IOS) first so that iOS builds
+        do not try to evaluate __MAC_OS_X_VERSION_MIN_REQUIRED.
+
 2013-01-28  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1206 +1206 @@
 #endif
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !PLATFORM(IOS)
+#if !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
 #define WTF_USE_CONTENT_FILTERING 1
 #endif