Fix dump_syms clang Windows build.

- Put FileHeaderMachineToCpuString definition in header.
- Remove extra semi-colon.

Change-Id: I726ad0f73c57908576414fd828052dff09f5c51f
Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/1673142
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Nelson Billing 2019-06-24 17:16:46 -07:00
parent c11646e643
commit e1b5fef027
3 changed files with 13 additions and 23 deletions

View file

@ -404,25 +404,4 @@ wstring GenerateDebugIdentifier(DWORD age, DWORD signature)
return wstring(identifier_string);
}
constexpr const wchar_t* FileHeaderMachineToCpuString(WORD machine)
{
{
switch (machine) {
case IMAGE_FILE_MACHINE_I386:
{
return L"x86";
}
case IMAGE_FILE_MACHINE_IA64:
case IMAGE_FILE_MACHINE_AMD64:
{
return L"x86_64";
}
default:
{
return L"unknown";
}
}
}
}
} // namespace google_breakpad

View file

@ -60,7 +60,18 @@ wstring GenerateDebugIdentifier(DWORD age, DWORD signature);
// Converts |machine| enum value to the corresponding string used by Breakpad.
// The enum is IMAGE_FILE_MACHINE_*, contained in winnt.h.
constexpr const wchar_t* FileHeaderMachineToCpuString(WORD machine);
constexpr const wchar_t* FileHeaderMachineToCpuString(WORD machine) {
switch (machine) {
case IMAGE_FILE_MACHINE_I386: {
return L"x86";
}
case IMAGE_FILE_MACHINE_IA64:
case IMAGE_FILE_MACHINE_AMD64: {
return L"x86_64";
}
default: { return L"unknown"; }
}
}
} // namespace google_breakpad

View file

@ -38,7 +38,7 @@
#include "common/windows/pdb_source_line_writer.h"
#include "common/windows/pe_source_line_writer.h"
using std::wstring;;
using std::wstring;
using google_breakpad::PDBSourceLineWriter;
using google_breakpad::PESourceLineWriter;
using std::unique_ptr;