From 096992fac73756cfa0974a94754329f30fd4e786 Mon Sep 17 00:00:00 2001 From: nealsid Date: Tue, 1 Dec 2009 21:35:52 +0000 Subject: 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 --- src/tools/linux/md2core/minidump-2-core.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/tools/linux/md2core/minidump-2-core.cc') diff --git a/src/tools/linux/md2core/minidump-2-core.cc b/src/tools/linux/md2core/minidump-2-core.cc index e333d119..29ae3280 100644 --- a/src/tools/linux/md2core/minidump-2-core.cc +++ b/src/tools/linux/md2core/minidump-2-core.cc @@ -47,7 +47,8 @@ #include "google_breakpad/common/minidump_format.h" #include "google_breakpad/common/minidump_cpu_x86.h" -#include "breakpad/linux/minidump_format_linux.h" +#include "common/linux/linux_syscall_support.h" +#include "common/linux/minidump_format_linux.h" #if __WORDSIZE == 64 #define ELF_CLASS ELFCLASS64 @@ -419,7 +420,7 @@ ParseModuleStream(CrashedProcess* crashinfo, MMappedRange range) { CrashedProcess::Mapping mapping; const MDRawModule* rawmodule = (MDRawModule*) range.GetArrayElement(sizeof(uint32_t), - sizeof(MDRawModule), i); + MD_MODULE_SIZE, i); mapping.start_address = rawmodule->base_of_image; mapping.end_address = rawmodule->size_of_image + rawmodule->base_of_image; -- cgit v1.2.1