Title: [208544] tags/Safari-603.1.12/Source/WebCore
- Revision
- 208544
- Author
- matthew_han...@apple.com
- Date
- 2016-11-10 09:30:34 -0800 (Thu, 10 Nov 2016)
Log Message
Merge r208504. rdar://problem/29185888
Modified Paths
Diff
Modified: tags/Safari-603.1.12/Source/WebCore/ChangeLog (208543 => 208544)
--- tags/Safari-603.1.12/Source/WebCore/ChangeLog 2016-11-10 17:30:32 UTC (rev 208543)
+++ tags/Safari-603.1.12/Source/WebCore/ChangeLog 2016-11-10 17:30:34 UTC (rev 208544)
@@ -1,5 +1,15 @@
2016-11-10 Matthew Hanson <matthew_han...@apple.com>
+ Merge r208504. rdar://problem/29185888
+
+ 2016-11-09 Anders Carlsson <ander...@apple.com>
+
+ Fix STP build.
+
+ * WebCorePrefix.h:
+
+2016-11-10 Matthew Hanson <matthew_han...@apple.com>
+
Merge r208464. rdar://problem/29098431
2016-11-09 Jer Noble <jer.no...@apple.com>
Modified: tags/Safari-603.1.12/Source/WebCore/WebCorePrefix.h (208543 => 208544)
--- tags/Safari-603.1.12/Source/WebCore/WebCorePrefix.h 2016-11-10 17:30:32 UTC (rev 208543)
+++ tags/Safari-603.1.12/Source/WebCore/WebCorePrefix.h 2016-11-10 17:30:34 UTC (rev 208544)
@@ -172,7 +172,7 @@
#define delete ("if you use new/delete make sure to include config.h at the top of the file"())
#endif
-#if USE(APPLE_INTERNAL_SDK)
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/ApplePayWebCorePrefixAdditions.h>)
#include <WebKitAdditions/ApplePayWebCorePrefixAdditions.h>
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
