Title: [231651] trunk/Source
- Revision
- 231651
- Author
- timothy_hor...@apple.com
- Date
- 2018-05-10 11:54:15 -0700 (Thu, 10 May 2018)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (231650 => 231651)
--- trunk/Source/WTF/ChangeLog 2018-05-10 18:48:26 UTC (rev 231650)
+++ trunk/Source/WTF/ChangeLog 2018-05-10 18:54:15 UTC (rev 231651)
@@ -1,3 +1,13 @@
+2018-05-10 Tim Horton <timothy_hor...@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 <mcatanz...@igalia.com>
[WPE] Build cleanly with GCC 8 and ICU 60
Modified: trunk/Source/WTF/wtf/Platform.h (231650 => 231651)
--- trunk/Source/WTF/wtf/Platform.h 2018-05-10 18:48:26 UTC (rev 231650)
+++ trunk/Source/WTF/wtf/Platform.h 2018-05-10 18:54:15 UTC (rev 231651)
@@ -1311,7 +1311,7 @@
#define HAVE_RSA_PSS 1
#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
Modified: trunk/Source/WebCore/ChangeLog (231650 => 231651)
--- trunk/Source/WebCore/ChangeLog 2018-05-10 18:48:26 UTC (rev 231650)
+++ trunk/Source/WebCore/ChangeLog 2018-05-10 18:54:15 UTC (rev 231651)
@@ -1,3 +1,13 @@
+2018-05-10 Tim Horton <timothy_hor...@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.carl...@apple.com>
Log missing cues correctly
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (231650 => 231651)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2018-05-10 18:48:26 UTC (rev 231650)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2018-05-10 18:54:15 UTC (rev 231651)
@@ -187,8 +187,14 @@
WK_HAVE_DEVICE_IDENTITY = $(WK_HAVE_DEVICE_IDENTITY_$(PLATFORM_NAME));
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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
