BUILD FIX: Platform.h:1212:22: error: '__MAC_OS_X_VERSION_MIN_REQUIRED' is not define...
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 28 Jan 2013 19:56:41 +0000 (19:56 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 28 Jan 2013 19:56:41 +0000 (19:56 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@140988 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WTF/ChangeLog
Source/WTF/wtf/Platform.h

index 9ec2869..74f8b14 100644 (file)
@@ -1,3 +1,18 @@
+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>
 
         Remove webkitNotifications.createHTMLNotification
index 4d27b32..34499f0 100644 (file)
 #endif
 #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