From c971cf439cec3d412e297199db2416523c1a889d Mon Sep 17 00:00:00 2001
From: "ted.mielczarek@gmail.com" <ted.mielczarek@gmail.com>
Date: Mon, 3 Nov 2014 17:05:39 +0000
Subject: Fix Windows client compilation on mingw. A=Jacek Caban
 <jacek@codeweavers.com>, R=ted at http://breakpad.appspot.com/548002/

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1399 4c0a9323-5329-0410-9bdc-e9ce6186880e
---
 src/client/windows/crash_generation/client_info.h         | 4 ++--
 src/client/windows/crash_generation/minidump_generator.cc | 9 +++++++--
 src/client/windows/crash_generation/minidump_generator.h  | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/client/windows/crash_generation')

diff --git a/src/client/windows/crash_generation/client_info.h b/src/client/windows/crash_generation/client_info.h
index 9f94bec8..6a8fba31 100644
--- a/src/client/windows/crash_generation/client_info.h
+++ b/src/client/windows/crash_generation/client_info.h
@@ -30,8 +30,8 @@
 #ifndef CLIENT_WINDOWS_CRASH_GENERATION_CLIENT_INFO_H__
 #define CLIENT_WINDOWS_CRASH_GENERATION_CLIENT_INFO_H__
 
-#include <Windows.h>
-#include <DbgHelp.h>
+#include <windows.h>
+#include <dbghelp.h>
 #include "client/windows/common/ipc_protocol.h"
 #include "common/scoped_ptr.h"
 #include "google_breakpad/common/minidump_format.h"
diff --git a/src/client/windows/crash_generation/minidump_generator.cc b/src/client/windows/crash_generation/minidump_generator.cc
index 22e8d365..c3e91681 100644
--- a/src/client/windows/crash_generation/minidump_generator.cc
+++ b/src/client/windows/crash_generation/minidump_generator.cc
@@ -176,9 +176,14 @@ bool HandleTraceData::CollectHandleData(
   stream_data->Reserved = 0;
   std::copy(operations_.begin(),
             operations_.end(),
+#ifdef _MSC_VER
             stdext::checked_array_iterator<AVRF_HANDLE_OPERATION*>(
                 reinterpret_cast<AVRF_HANDLE_OPERATION*>(stream_data + 1),
-                operations_.size()));
+                operations_.size())
+#else
+            reinterpret_cast<AVRF_HANDLE_OPERATION*>(stream_data + 1)
+#endif
+            );
 
   return true;
 }
@@ -350,7 +355,7 @@ bool MinidumpGenerator::WriteMinidump() {
   user_streams.UserStreamArray = user_stream_array.get();
 
   MDRawAssertionInfo* actual_assert_info = assert_info_;
-  MDRawAssertionInfo client_assert_info = {0};
+  MDRawAssertionInfo client_assert_info = {{0}};
 
   if (assert_info_) {
     // If the assertion info object lives in the client process,
diff --git a/src/client/windows/crash_generation/minidump_generator.h b/src/client/windows/crash_generation/minidump_generator.h
index b95e04eb..a3c12305 100644
--- a/src/client/windows/crash_generation/minidump_generator.h
+++ b/src/client/windows/crash_generation/minidump_generator.h
@@ -34,6 +34,7 @@
 #include <dbghelp.h>
 #include <rpc.h>
 #include <list>
+#include <string>
 #include "google_breakpad/common/minidump_format.h"
 
 namespace google_breakpad {
-- 
cgit v1.2.1