Title: [106069] branches/safari-534.54-branch/Source/WebKit2
Diff
Modified: branches/safari-534.54-branch/Source/WebKit2/ChangeLog (106068 => 106069)
--- branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-01-27 01:30:24 UTC (rev 106068)
+++ branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2012-01-27 01:30:29 UTC (rev 106069)
@@ -1,5 +1,20 @@
2012-01-26 Mark Rowe <[email protected]>
+ Merge r102504.
+
+ 2011-12-09 Mark Rowe <[email protected]>
+
+ Fix the Snow Leopard build.
+
+ Wrap some code that is only applicable to Lion and newer in the appropriate #if's.
+
+ * UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.h:
+ * UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm:
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::ProcessLauncher::launchProcess):
+
+2012-01-26 Mark Rowe <[email protected]>
+
Merge r102497.
2011-12-07 Mark Rowe <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.h (106068 => 106069)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.h 2012-01-27 01:30:24 UTC (rev 106068)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.h 2012-01-27 01:30:29 UTC (rev 106069)
@@ -26,6 +26,8 @@
#ifndef DynamicLinkerEnvironmentExtractor_h
#define DynamicLinkerEnvironmentExtractor_h
+#ifndef BUILDING_ON_SNOW_LEOPARD
+
#include <mach/machine.h>
#include <wtf/Noncopyable.h>
#include <wtf/RetainPtr.h>
@@ -59,4 +61,6 @@
} // namespace WebKit
+#endif // BUILDING_ON_SNOW_LEOPARD
+
#endif // DynamicLinkerEnvironmentExtractor_h
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm (106068 => 106069)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm 2012-01-27 01:30:24 UTC (rev 106068)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm 2012-01-27 01:30:29 UTC (rev 106069)
@@ -23,6 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef BUILDING_ON_SNOW_LEOPARD
+
#include "config.h"
#include "DynamicLinkerEnvironmentExtractor.h"
@@ -198,3 +200,5 @@
}
} // namespace WebKit
+
+#endif // BUILDING_ON_SNOW_LEOPARD
Modified: branches/safari-534.54-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (106068 => 106069)
--- branches/safari-534.54-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2012-01-27 01:30:24 UTC (rev 106068)
+++ branches/safari-534.54-branch/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2012-01-27 01:30:29 UTC (rev 106069)
@@ -137,8 +137,10 @@
EnvironmentVariables environmentVariables;
+#ifndef BUILDING_ON_SNOW_LEOPARD
DynamicLinkerEnvironmentExtractor environmentExtractor([[NSBundle mainBundle] executablePath], architecture);
environmentExtractor.getExtractedEnvironmentVariables(environmentVariables);
+#endif
// To make engineering builds work, if the path is outside of /System set up
// DYLD_FRAMEWORK_PATH to pick up other frameworks, but don't do it for the
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
