Title: [168818] branches/safari-538.34-branch/Source/WebKit2
Diff
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (168817 => 168818)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 08:37:08 UTC (rev 168817)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 08:40:26 UTC (rev 168818)
@@ -1,5 +1,15 @@
2014-05-14 Lucas Forschler <[email protected]>
+ Merge r168724
+
+ 2014-05-13 Anders Carlsson <[email protected]>
+
+ Another follow-up build fix.
+
+ * Shared/API/Cocoa/WKFoundation.h:
+
+2014-05-14 Lucas Forschler <[email protected]>
+
Merge r168694
2014-05-13 Anders Carlsson <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (168817 => 168818)
--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2014-05-14 08:37:08 UTC (rev 168817)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2014-05-14 08:40:26 UTC (rev 168818)
@@ -45,11 +45,14 @@
#define WK_ENUM_AVAILABLE(_mac, _ios)
#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
+
+#ifdef __OBJC__
#import <Foundation/Foundation.h>
-
typedef NSUInteger NSEventModifierFlags;
#endif
#endif
+#endif
+
#define WK_DESIGNATED_INITIALIZER
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
