diff options
| author | ted.mielczarek <ted.mielczarek@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2010-04-29 18:02:42 +0000 |
|---|---|---|
| committer | ted.mielczarek <ted.mielczarek@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2010-04-29 18:02:42 +0000 |
| commit | 131c0c6a831cda65bee196062ebe460f09851b14 (patch) | |
| tree | 4dd8298ed77ade06dc96aaf23f2d08bce6947361 /src/common | |
| parent | Fix include paths to be consistent with rest of project (diff) | |
| download | breakpad-131c0c6a831cda65bee196062ebe460f09851b14.tar.xz | |
issue 372 - fix Mac OS X minidump generation code to handle x86-64 properly. r=mark at http://breakpad.appspot.com/103001
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@578 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/mac/macho_utilities.h | 2 | ||||
| -rw-r--r-- | src/common/mac/macho_walker.cc | 4 | ||||
| -rw-r--r-- | src/common/mac/string_utilities.cc | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/common/mac/macho_utilities.h b/src/common/mac/macho_utilities.h index f74e93aa..a07945fd 100644 --- a/src/common/mac/macho_utilities.h +++ b/src/common/mac/macho_utilities.h @@ -56,6 +56,8 @@ #if TARGET_CPU_X86 # define BREAKPAD_MACHINE_THREAD_STATE i386_THREAD_STATE +#elif TARGET_CPU_X86_64 +# define BREAKPAD_MACHINE_THREAD_STATE x86_THREAD_STATE64 #else # define BREAKPAD_MACHINE_THREAD_STATE MACHINE_THREAD_STATE #endif diff --git a/src/common/mac/macho_walker.cc b/src/common/mac/macho_walker.cc index dd2c3b39..4bc2ebba 100644 --- a/src/common/mac/macho_walker.cc +++ b/src/common/mac/macho_walker.cc @@ -71,7 +71,9 @@ int MachoWalker::ValidateCPUType(int cpu_type) { #if __ppc__ cpu_type = CPU_TYPE_POWERPC; #elif __i386__ - cpu_type = CPU_TYPE_X86; + cpu_type = CPU_TYPE_X86; +#elif __x86_64__ + cpu_type = CPU_TYPE_X86_64; #else #error Unknown architecture -- are you on a PDP-11? #endif diff --git a/src/common/mac/string_utilities.cc b/src/common/mac/string_utilities.cc index bdf3336c..5a89be38 100644 --- a/src/common/mac/string_utilities.cc +++ b/src/common/mac/string_utilities.cc @@ -55,10 +55,10 @@ std::string ConvertToString(CFStringRef str) { unsigned int IntegerValueAtIndex(string &str, unsigned int idx) { string digits("0123456789"), temp; - unsigned int start = 0; - unsigned int end; - unsigned int found = 0; - unsigned int result = 0; + size_t start = 0; + size_t end; + size_t found = 0; + size_t result = 0; for (; found <= idx; ++found) { end = str.find_first_not_of(digits, start); |