Title: [175337] branches/safari-600.3-branch/Source/WebKit/mac
- Revision
- 175337
- Author
- [email protected]
- Date
- 2014-10-29 12:01:27 -0700 (Wed, 29 Oct 2014)
Log Message
Fix the branch pre-Yosemite build by moving an #if to encompass the whole file.
* Misc/WebSharingServicePickerController.mm:
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (175336 => 175337)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-10-29 18:56:42 UTC (rev 175336)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-10-29 19:01:27 UTC (rev 175337)
@@ -1,5 +1,11 @@
2014-10-29 Lucas Forschler <[email protected]>
+ Fix the branch pre-Yosemite build by moving an #if to encompass the whole file.
+
+ * Misc/WebSharingServicePickerController.mm:
+
+2014-10-29 Lucas Forschler <[email protected]>
+
Merge r175229
2014-10-27 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm (175336 => 175337)
--- branches/safari-600.3-branch/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2014-10-29 18:56:42 UTC (rev 175336)
+++ branches/safari-600.3-branch/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2014-10-29 19:01:27 UTC (rev 175337)
@@ -48,7 +48,6 @@
- (void)loadItemForTypeIdentifier:(NSString *)typeIdentifier options:(NSDictionary *)options completionHandler:(void (^)(id <NSSecureCoding> item, NSError *error))completionHandler;
@end
#endif
-#endif
static NSString *serviceControlsPasteboardName = @"WebKitServiceControlsPasteboard";
@@ -222,3 +221,5 @@
}
@end
+
+#endif // ENABLE(SERVICE_CONTROLS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
