Title: [168817] branches/safari-538.34-branch/Source/WebKit2
Diff
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (168816 => 168817)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 08:35:12 UTC (rev 168816)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 08:37:08 UTC (rev 168817)
@@ -1,5 +1,15 @@
2014-05-14 Lucas Forschler <[email protected]>
+ Merge r168694
+
+ 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 r168691
2014-05-13 Anders Carlsson <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (168816 => 168817)
--- branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2014-05-14 08:35:12 UTC (rev 168816)
+++ branches/safari-538.34-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2014-05-14 08:37:08 UTC (rev 168817)
@@ -45,6 +45,8 @@
#define WK_ENUM_AVAILABLE(_mac, _ios)
#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
+#import <Foundation/Foundation.h>
+
typedef NSUInteger NSEventModifierFlags;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
