diff options
| author | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2011-10-06 18:03:17 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2011-10-06 18:03:17 +0000 |
| commit | be368a3d4a5ab67d9bafc24e46635fb2d3fda7ea (patch) | |
| tree | 3f29a37a47939973bf82a4219129db0fb01145cc | |
| parent | Adding .dirstamp to svn:ignore for libdisasm. (diff) | |
| download | breakpad-be368a3d4a5ab67d9bafc24e46635fb2d3fda7ea.tar.xz | |
10.4 SDK fix
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@847 4c0a9323-5329-0410-9bdc-e9ce6186880e
| -rw-r--r-- | src/client/mac/Framework/OnDemandServer.mm | 6 | ||||
| -rw-r--r-- | src/client/mac/crash_generation/Inspector.mm | 9 | ||||
| -rw-r--r-- | src/client/mac/handler/minidump_test.xcodeproj/project.pbxproj | 7 |
3 files changed, 21 insertions, 1 deletions
diff --git a/src/client/mac/Framework/OnDemandServer.mm b/src/client/mac/Framework/OnDemandServer.mm index 43a2703b..cfbc6629 100644 --- a/src/client/mac/Framework/OnDemandServer.mm +++ b/src/client/mac/Framework/OnDemandServer.mm @@ -33,9 +33,15 @@ #if DEBUG #define PRINT_MACH_RESULT(result_, message_) \ printf(message_"%s (%d)\n", mach_error_string(result_), result_ ); +#if defined(MAC_OS_X_VERSION_10_5) && \ + MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 #define PRINT_BOOTSTRAP_RESULT(result_, message_) \ printf(message_"%s (%d)\n", bootstrap_strerror(result_), result_ ); #else + #define PRINT_BOOTSTRAP_RESULT(result_, message_) \ + PRINT_MACH_RESULT(result_, message_) +#endif +#else #define PRINT_MACH_RESULT(result_, message_) #define PRINT_BOOTSTRAP_RESULT(result_, message_) #endif diff --git a/src/client/mac/crash_generation/Inspector.mm b/src/client/mac/crash_generation/Inspector.mm index 47d3e7b7..24dc7940 100644 --- a/src/client/mac/crash_generation/Inspector.mm +++ b/src/client/mac/crash_generation/Inspector.mm @@ -31,6 +31,7 @@ #include <cstdio> #include <iostream> +#include <servers/bootstrap.h> #include <stdio.h> #include <string.h> #include <string> @@ -266,7 +267,13 @@ kern_return_t Inspector::ResetBootstrapPort() { &bootstrap_parent_port); if (kr != BOOTSTRAP_SUCCESS) { NSLog(@"ResetBootstrapPort: bootstrap_look_up failed: %s (%d)", - bootstrap_strerror(kr), kr); +#if defined(MAC_OS_X_VERSION_10_5) && \ + MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + bootstrap_strerror(kr), +#else + mach_error_string(kr), +#endif + kr); return kr; } diff --git a/src/client/mac/handler/minidump_test.xcodeproj/project.pbxproj b/src/client/mac/handler/minidump_test.xcodeproj/project.pbxproj index b140a71a..bb632ed7 100644 --- a/src/client/mac/handler/minidump_test.xcodeproj/project.pbxproj +++ b/src/client/mac/handler/minidump_test.xcodeproj/project.pbxproj @@ -451,7 +451,14 @@ isa = PBXProject; buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "minidump_test" */; compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 08FB7794FE84155DC02AAC07 /* MinidumpWriter */; projectDirPath = ""; projectRoot = ""; |