Title: [222076] tags/Safari-605.1.6.0.1/Source/WebCore/PAL
- Revision
- 222076
- Author
- [email protected]
- Date
- 2017-09-14 22:10:37 -0700 (Thu, 14 Sep 2017)
Log Message
Merged r222072. rdar://problem/34452503
Modified Paths
Diff
Modified: tags/Safari-605.1.6.0.1/Source/WebCore/PAL/ChangeLog (222075 => 222076)
--- tags/Safari-605.1.6.0.1/Source/WebCore/PAL/ChangeLog 2017-09-15 05:08:26 UTC (rev 222075)
+++ tags/Safari-605.1.6.0.1/Source/WebCore/PAL/ChangeLog 2017-09-15 05:10:37 UTC (rev 222076)
@@ -1,3 +1,13 @@
+2017-09-14 Babak Shafiei <[email protected]>
+
+ Merge r222072.
+
+ 2017-09-14 Dan Bernstein <[email protected]>
+
+ Fixed building with the Apple internal macOS 10.12 SDK.
+
+ * pal/spi/cocoa/PassKitSPI.h: Avoid redefining types that are defined in the SDK.
+
2017-09-12 Myles C. Maxfield <[email protected]>
Unskip fast/text/system-font-synthetic-italic.html
Modified: tags/Safari-605.1.6.0.1/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h (222075 => 222076)
--- tags/Safari-605.1.6.0.1/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h 2017-09-15 05:08:26 UTC (rev 222075)
+++ tags/Safari-605.1.6.0.1/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h 2017-09-15 05:10:37 UTC (rev 222076)
@@ -249,7 +249,7 @@
#endif
-#if PLATFORM(MAC) && (!USE(APPLE_INTERNAL_SDK) || __MAC_OS_X_VERSION_MAX_ALLOWED < 101204)
+#if PLATFORM(MAC) && !USE(APPLE_INTERNAL_SDK)
typedef NS_ENUM(NSInteger, PKPaymentButtonStyle) {
PKPaymentButtonStyleWhite = 0,
PKPaymentButtonStyleWhiteOutline,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
