Title: [244643] trunk/Source/WebCore
- Revision
- 244643
- Author
- [email protected]
- Date
- 2019-04-25 04:29:14 -0700 (Thu, 25 Apr 2019)
Log Message
redefinition of enumerator 'NSAttachmentCharacter' with Apple internal build
https://bugs.webkit.org/show_bug.cgi?id=197279
Reviewed by Antoine Quint.
Try to fix the build.
* platform/mac/WebNSAttributedStringExtras.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (244642 => 244643)
--- trunk/Source/WebCore/ChangeLog 2019-04-25 09:55:38 UTC (rev 244642)
+++ trunk/Source/WebCore/ChangeLog 2019-04-25 11:29:14 UTC (rev 244643)
@@ -1,5 +1,16 @@
2019-04-25 Antti Koivisto <[email protected]>
+ redefinition of enumerator 'NSAttachmentCharacter' with Apple internal build
+ https://bugs.webkit.org/show_bug.cgi?id=197279
+
+ Reviewed by Antoine Quint.
+
+ Try to fix the build.
+
+ * platform/mac/WebNSAttributedStringExtras.mm:
+
+2019-04-25 Antti Koivisto <[email protected]>
+
Visited link hash should be computed only once
https://bugs.webkit.org/show_bug.cgi?id=197229
<rdar://problem/48438924>
Modified: trunk/Source/WebCore/platform/mac/WebNSAttributedStringExtras.mm (244642 => 244643)
--- trunk/Source/WebCore/platform/mac/WebNSAttributedStringExtras.mm 2019-04-25 09:55:38 UTC (rev 244642)
+++ trunk/Source/WebCore/platform/mac/WebNSAttributedStringExtras.mm 2019-04-25 11:29:14 UTC (rev 244643)
@@ -27,10 +27,14 @@
#import "WebNSAttributedStringExtras.h"
#if PLATFORM(IOS_FAMILY)
+#if USE(APPLE_INTERNAL_SDK)
+#import <UIKit/NSTextAttachment.h>
+#else
enum {
NSAttachmentCharacter = 0xfffc /* To denote attachments. */
};
#endif
+#endif
namespace WebCore {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
