Changeset 231651 in webkit

Timestamp:

May 10, 2018 11:54:15 AM (6 years ago)

Author:

timothy_horton@apple.com

Message:

Fix the build after r231393
​https://bugs.webkit.org/show_bug.cgi?id=185519
<rdar://problem/40131741>

Reviewed by Simon Fraser.

Source/WebCore:

• Configurations/WebCore.xcconfig:

Source/WTF:

• wtf/Platform.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Configurations/WebCore.xcconfig (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-05-10  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the build after r231393
+        https://bugs.webkit.org/show_bug.cgi?id=185519
+        <rdar://problem/40131741>
+
+        Reviewed by Simon Fraser.
+
+        * wtf/Platform.h:
+
 2018-05-09  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1312 +1312 @@
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000 && !PLATFORM(APPLETV))
 #define HAVE_URL_FORMATTING 1
 #endif

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-10  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the build after r231393
+        https://bugs.webkit.org/show_bug.cgi?id=185519
+        <rdar://problem/40131741>
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/WebCore.xcconfig:
+
 2018-05-10  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/Configurations/WebCore.xcconfig

@@ -188 +188 @@
 WK_HAVE_DEVICE_IDENTITY_iphoneos = YES;
 
-WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-WK_HAVE_URL_FORMATTING_COCOA_TOUCH_YES = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
-WK_HAVE_URL_FORMATTING_COCOA_TOUCH_NO = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014));
+WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_$(WK_PLATFORM_NAME));
+WK_HAVE_URL_FORMATTING_iphoneos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_iphoneminimalsimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_iphonesimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_watchos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_watchsimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_appletvos = NO
+WK_HAVE_URL_FORMATTING_appletvsimulator = NO;
+WK_HAVE_URL_FORMATTING_macosx = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014));
 WK_HAVE_URL_FORMATTING_MACOS_SINCE_1014 = YES;
 WK_HAVE_URL_FORMATTING_IOS_SINCE_12 = YES;