Title: [87240] branches/safari-534-branch/Source/WebKit2
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87239 => 87240)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-25 00:24:38 UTC (rev 87239)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-25 00:25:26 UTC (rev 87240)
@@ -1,5 +1,15 @@
2011-05-24 Lucas Forschler <[email protected]>
+ Merged r87154.
+
+ 2011-05-24 Brady Eidson <[email protected]>
+
+ Build fix after r87153
+
+ * WebProcess/mac/SecItemShimMethods.mm: Don't compile this code on SnowLeopard.
+
+2011-05-24 Lucas Forschler <[email protected]>
+
Merged r87153.
2011-05-23 Brady Eidson <[email protected]>
Modified: branches/safari-534-branch/Source/WebKit2/WebProcess/mac/SecItemShimMethods.mm (87239 => 87240)
--- branches/safari-534-branch/Source/WebKit2/WebProcess/mac/SecItemShimMethods.mm 2011-05-25 00:24:38 UTC (rev 87239)
+++ branches/safari-534-branch/Source/WebKit2/WebProcess/mac/SecItemShimMethods.mm 2011-05-25 00:25:26 UTC (rev 87240)
@@ -25,6 +25,8 @@
#import "config.h"
#import "SecItemShimMethods.h"
+#if !defined(BUILDING_ON_SNOW_LEOPARD)
+
#import "SecItemRequestData.h"
#import "SecItemResponseData.h"
#import "WebProcess.h"
@@ -168,3 +170,5 @@
}
} // namespace WebKit
+
+#endif // !BUILDING_ON_SNOW_LEOPARD
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
