From 29401d2457120b6d581affdb440017433ca93e77 Mon Sep 17 00:00:00 2001
From: mmentovai <mmentovai@4c0a9323-5329-0410-9bdc-e9ce6186880e>
Date: Thu, 26 Oct 2006 18:06:43 +0000
Subject: Support building with WIN32_LEAN_AND_MEAN (#60)  - All Windows code
 now builds with WIN32_LEAN_AND_MEAN by default.  - Header inclusion is
 adjusted as needed. Remove use of UuidToString (#39)  - Also breaks
 dependency on RpcStringFree and therefore rpcrt4.lib. r=bryner

http://groups.google.com/group/airbag-dev/browse_thread/thread/30f844cfc7ccd37f


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@51 4c0a9323-5329-0410-9bdc-e9ce6186880e
---
 src/tools/windows/dump_syms/dump_syms.cc     |  2 ++
 src/tools/windows/dump_syms/dump_syms.vcproj | 12 ++++++++++--
 src/tools/windows/symupload/symupload.cc     | 12 ++++++------
 src/tools/windows/symupload/symupload.vcproj | 12 ++++++++++--
 4 files changed, 28 insertions(+), 10 deletions(-)

(limited to 'src/tools/windows')

diff --git a/src/tools/windows/dump_syms/dump_syms.cc b/src/tools/windows/dump_syms/dump_syms.cc
index ca63c2c4..01bc6931 100644
--- a/src/tools/windows/dump_syms/dump_syms.cc
+++ b/src/tools/windows/dump_syms/dump_syms.cc
@@ -31,7 +31,9 @@
 // a text-based format that we can use from the minidump processor.
 
 #include <stdio.h>
+
 #include <string>
+
 #include "common/windows/pdb_source_line_writer.h"
 
 using std::wstring;
diff --git a/src/tools/windows/dump_syms/dump_syms.vcproj b/src/tools/windows/dump_syms/dump_syms.vcproj
index 19682d6e..c0a3390f 100644
--- a/src/tools/windows/dump_syms/dump_syms.vcproj
+++ b/src/tools/windows/dump_syms/dump_syms.vcproj
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(VSInstallDir)\DIA SDK\include&quot;;..\..\.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(VSInstallDir)\DIA SDK\include&quot;;..\..\.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -175,6 +175,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\..\..\common\windows\guid_string.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\common\windows\pdb_source_line_writer.h"
 				>
@@ -195,6 +199,10 @@
 				RelativePath=".\dump_syms.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\common\windows\guid_string.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\common\windows\pdb_source_line_writer.cc"
 				>
diff --git a/src/tools/windows/symupload/symupload.cc b/src/tools/windows/symupload/symupload.cc
index e5c74664..b528c322 100644
--- a/src/tools/windows/symupload/symupload.cc
+++ b/src/tools/windows/symupload/symupload.cc
@@ -37,17 +37,17 @@
 //        e.g. 11111111-2222-3333-4444-555555555555
 //  symbol_file: the airbag-format symbol file
 
-#include <windows.h>
-#include <wininet.h>
-#include <dbghelp.h>
+#include <Windows.h>
+#include <DbgHelp.h>
+#include <WinInet.h>
 
 #include <cstdio>
-#include <vector>
-#include <string>
 #include <map>
+#include <string>
+#include <vector>
 
-#include "common/windows/pdb_source_line_writer.h"
 #include "common/windows/http_upload.h"
+#include "common/windows/pdb_source_line_writer.h"
 
 using std::string;
 using std::wstring;
diff --git a/src/tools/windows/symupload/symupload.vcproj b/src/tools/windows/symupload/symupload.vcproj
index 63b731c1..ddd63fc1 100755
--- a/src/tools/windows/symupload/symupload.vcproj
+++ b/src/tools/windows/symupload/symupload.vcproj
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(VSInstallDir)\DIA SDK\include&quot;;..\..\.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -116,7 +116,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(VSInstallDir)\DIA SDK\include&quot;;..\..\.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -176,6 +176,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\..\..\common\windows\guid_string.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\common\windows\http_upload.h"
 				>
@@ -196,6 +200,10 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\..\..\common\windows\guid_string.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\common\windows\http_upload.cc"
 				>
-- 
cgit v1.2.1