diff options
| author | ted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2010-12-16 22:52:38 +0000 |
|---|---|---|
| committer | ted.mielczarek@gmail.com <ted.mielczarek@gmail.com@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2010-12-16 22:52:38 +0000 |
| commit | c45b12b4225be716eba98f8305eebe36b2b19dbb (patch) | |
| tree | 04abc736760349d6d8d4880c3e3d75cfb21197fc /src/client/mac/crash_generation | |
| parent | Allow out-of-process minidump generation to work on processes of a different ... (diff) | |
| download | breakpad-c45b12b4225be716eba98f8305eebe36b2b19dbb.tar.xz | |
Fix MinidumpGenerator::WriteExceptionStream for writing cross-architecture dumps
R=mark at http://breakpad.appspot.com/244001
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@747 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/mac/crash_generation')
| -rw-r--r-- | src/client/mac/crash_generation/crash_generation_client.cc | 3 | ||||
| -rw-r--r-- | src/client/mac/crash_generation/crash_generation_server.h | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/client/mac/crash_generation/crash_generation_client.cc b/src/client/mac/crash_generation/crash_generation_client.cc index 07428876..ceeb3b32 100644 --- a/src/client/mac/crash_generation/crash_generation_client.cc +++ b/src/client/mac/crash_generation/crash_generation_client.cc @@ -54,7 +54,7 @@ bool CrashGenerationClient::RequestDumpForException( info.exception_code = exception_code; info.exception_subcode = exception_subcode; message.SetData(&info, sizeof(info)); - + const mach_msg_timeout_t kSendTimeoutMs = 2 * 1000; kern_return_t result = sender_.SendMessage(message, kSendTimeoutMs); if (result != KERN_SUCCESS) @@ -66,7 +66,6 @@ bool CrashGenerationClient::RequestDumpForException( MachReceiveMessage acknowledge_message; result = acknowledge_port.WaitForMessage(&acknowledge_message, kReceiveTimeoutMs); - return result == KERN_SUCCESS; } diff --git a/src/client/mac/crash_generation/crash_generation_server.h b/src/client/mac/crash_generation/crash_generation_server.h index e174f9d0..6e6cb44d 100644 --- a/src/client/mac/crash_generation/crash_generation_server.h +++ b/src/client/mac/crash_generation/crash_generation_server.h @@ -30,6 +30,8 @@ #ifndef GOOGLE_BREAKPAD_CLIENT_MAC_CRASH_GENERATION_CRASH_GENERATION_SERVER_H_ #define GOOGLE_BREAKPAD_CLIENT_MAC_CRASH_GENERATION_CRASH_GENERATION_SERVER_H_ +#include <stdint.h> + #include <string> #include "common/mac/MachIPC.h" @@ -47,9 +49,9 @@ enum { // Exception details sent by the client when requesting a dump. struct ExceptionInfo { - int exception_type; - int exception_code; - int exception_subcode; + int32_t exception_type; + int32_t exception_code; + int32_t exception_subcode; }; class CrashGenerationServer { |