Title: [106070] branches/safari-534.54-branch/Source/WebKit2
Diff
Modified: branches/safari-534.54-branch/Source/WebKit2/ChangeLog (106069 => 106070)
--- branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-01-27 01:30:29 UTC (rev 106069)
+++ branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-01-27 01:30:33 UTC (rev 106070)
@@ -1,5 +1,17 @@
2012-01-26 Mark Rowe <[email protected]>
+ Merge r102507.
+
+ 2011-12-09 Mark Rowe <[email protected]>
+
+ Fix the Snow Leopard build some more.
+
+ Move the #if to a location where it will do some good.
+
+ * UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm:
+
+2012-01-26 Mark Rowe <[email protected]>
+
Merge r102504.
2011-12-09 Mark Rowe <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm (106069 => 106070)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm 2012-01-27 01:30:29 UTC (rev 106069)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm 2012-01-27 01:30:33 UTC (rev 106070)
@@ -23,11 +23,11 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef BUILDING_ON_SNOW_LEOPARD
-
#include "config.h"
#include "DynamicLinkerEnvironmentExtractor.h"
+#ifndef BUILDING_ON_SNOW_LEOPARD
+
#include "EnvironmentVariables.h"
#include <mach-o/loader.h>
#include <mach-o/swap.h>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
