From e1b5fef027efbd56063736ed56da73dc0caf6b92 Mon Sep 17 00:00:00 2001
From: Nelson Billing <nbilling@google.com>
Date: Mon, 24 Jun 2019 17:16:46 -0700
Subject: 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>
---
 src/common/windows/pe_util.cc            | 21 ---------------------
 src/common/windows/pe_util.h             | 13 ++++++++++++-
 src/tools/windows/dump_syms/dump_syms.cc |  2 +-
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/common/windows/pe_util.cc b/src/common/windows/pe_util.cc
index f599fb53..6fa63fa3 100644
--- a/src/common/windows/pe_util.cc
+++ b/src/common/windows/pe_util.cc
@@ -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
diff --git a/src/common/windows/pe_util.h b/src/common/windows/pe_util.h
index cea40a2e..634ba293 100644
--- a/src/common/windows/pe_util.h
+++ b/src/common/windows/pe_util.h
@@ -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
 
diff --git a/src/tools/windows/dump_syms/dump_syms.cc b/src/tools/windows/dump_syms/dump_syms.cc
index a61434be..5b7d1777 100644
--- a/src/tools/windows/dump_syms/dump_syms.cc
+++ b/src/tools/windows/dump_syms/dump_syms.cc
@@ -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;
-- 
cgit v1.2.1