From 2f217812634d5e6c56f0cf9e7a4c9b7fb390e954 Mon Sep 17 00:00:00 2001
From: patches <patches@localhost>
Date: Sat, 20 Jul 2019 15:52:37 +0100
Subject: [PATCH 4/4] Support compilation on VS 2015

---
 src/common/windows/pe_util.cc            | 1 +
 src/common/windows/pe_util.h             | 2 +-
 src/tools/windows/dump_syms/dump_syms.cc | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/common/windows/pe_util.cc b/src/common/windows/pe_util.cc
index 6fa63fa3..03dcd142 100644
--- a/src/common/windows/pe_util.cc
+++ b/src/common/windows/pe_util.cc
@@ -35,6 +35,7 @@
 #include <ImageHlp.h>
 
 #include <functional>
+#include <memory>
 
 #include "common/windows/string_utils-inl.h"
 #include "common/windows/guid_string.h"
diff --git a/src/common/windows/pe_util.h b/src/common/windows/pe_util.h
index 634ba293..3eefa761 100644
--- a/src/common/windows/pe_util.h
+++ b/src/common/windows/pe_util.h
@@ -60,7 +60,7 @@ 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) {
+static inline const wchar_t* FileHeaderMachineToCpuString(WORD machine) {
   switch (machine) {
     case IMAGE_FILE_MACHINE_I386: {
       return L"x86";
diff --git a/src/tools/windows/dump_syms/dump_syms.cc b/src/tools/windows/dump_syms/dump_syms.cc
index 5b7d1777..1f22cfc2 100644
--- a/src/tools/windows/dump_syms/dump_syms.cc
+++ b/src/tools/windows/dump_syms/dump_syms.cc
@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include <wchar.h>
 
+#include <memory>
 #include <string>
 
 #include "common/windows/pdb_source_line_writer.h"
-- 
2.21.0