Title: [239213] tags/Safari-607.1.16.3/Source/WebKit
- Revision
- 239213
- Author
- [email protected]
- Date
- 2018-12-14 09:53:37 -0800 (Fri, 14 Dec 2018)
Log Message
Cherry-pick r239112. rdar://problem/46546071
Unreviewed attempt to fix build with older SDKs after r239110.
* Platform/cocoa/WKCrashReporter.mm:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239112 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-607.1.16.3/Source/WebKit/ChangeLog (239212 => 239213)
--- tags/Safari-607.1.16.3/Source/WebKit/ChangeLog 2018-12-14 17:53:33 UTC (rev 239212)
+++ tags/Safari-607.1.16.3/Source/WebKit/ChangeLog 2018-12-14 17:53:37 UTC (rev 239213)
@@ -1,5 +1,21 @@
2018-12-14 Kocsen Chung <[email protected]>
+ Cherry-pick r239112. rdar://problem/46546071
+
+ Unreviewed attempt to fix build with older SDKs after r239110.
+
+ * Platform/cocoa/WKCrashReporter.mm:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239112 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-12-12 Chris Dumez <[email protected]>
+
+ Unreviewed attempt to fix build with older SDKs after r239110.
+
+ * Platform/cocoa/WKCrashReporter.mm:
+
+2018-12-14 Kocsen Chung <[email protected]>
+
Cherry-pick r239110. rdar://problem/46546071
Unreviewed, fix build with recent SDKs.
Modified: tags/Safari-607.1.16.3/Source/WebKit/Platform/cocoa/WKCrashReporter.mm (239212 => 239213)
--- tags/Safari-607.1.16.3/Source/WebKit/Platform/cocoa/WKCrashReporter.mm 2018-12-14 17:53:33 UTC (rev 239212)
+++ tags/Safari-607.1.16.3/Source/WebKit/Platform/cocoa/WKCrashReporter.mm 2018-12-14 17:53:37 UTC (rev 239213)
@@ -30,10 +30,17 @@
#import "CrashReporterClientSPI.h"
// Avoid having to link with libCrashReporterClient.a
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
CRASH_REPORTER_CLIENT_HIDDEN
struct crashreporter_annotations_t gCRAnnotations
__attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION)))
= { {CRASHREPORTER_ANNOTATIONS_VERSION}, {0}, {0}, {0}, {0}, {0}, {0}, {0} };
+#else
+CRASH_REPORTER_CLIENT_HIDDEN
+struct crashreporter_annotations_t gCRAnnotations
+__attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION)))
+ = { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0, 0 };
+#endif
namespace WebKit {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
