Upstreaming several patches from Chrome:

Build fix for systems where sys/user.h needs sys/types.h....
http://breakpad.appspot.com/40002
MDRawSystemInfo.processor_level refers to the CPU family, not the cpuid level..
http://breakpad.appspot.com/40003
Use MD_MODULE_SIZE in place of sizeof(MDRawModule).
http://breakpad.appspot.com/39003
Linux x64 compile fix.
http://breakpad.appspot.com/40004
Include linux_syscall_support.h to get definition of NT_PRXFPREG. This is
Chromium commit 23659.
http://breakpad.appspot.com/40005
Build breakpad / crash reporting on Linux 64-bit. This is Chromium commit
23396.
http://breakpad.appspot.com/40006
Fix #includes in a couple unit tests.
http://breakpad.appspot.com/41001
Clean up unused headers / files for Linux dump_syms.
http://breakpad.appspot.com/40002




git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@432 4c0a9323-5329-0410-9bdc-e9ce6186880e

1 files changed, 2 insertions, 2 deletions

diff --git a/src/client/linux/handler/exception_handler_unittest.cc b/src/client/linux/handler/exception_handler_unittest.cc
index 157c495a..2f4e1045 100644
--- a/src/client/linux/handler/exception_handler_unittest.cc
+++ b/src/client/linux/handler/exception_handler_unittest.cc
@@ -84,7 +84,7 @@ static bool DoneCallback(const char* dump_path,
   if (!succeeded)
     return succeeded;
 
-  int fd = (int) context;
+  int fd = (intptr_t) context;
   uint32_t len = my_strlen(minidump_id);
   HANDLE_EINTR(sys_write(fd, &len, sizeof(len)));
   HANDLE_EINTR(sys_write(fd, minidump_id, len));
@@ -143,7 +143,7 @@ static const unsigned kControlMsgSize =
 static bool
 CrashHandler(const void* crash_context, size_t crash_context_size,
              void* context) {
-  const int fd = (int) context;
+  const int fd = (intptr_t) context;
   int fds[2];
   pipe(fds);