Suyu/breakpad
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/breakpad.git synced 2026-01-10 00:18:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Windows client compilation on mingw.

Browse source 
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
This commit is contained in:
ted.mielczarek@gmail.com 2014-11-03 17:05:39 +00:00
parent 507a09f4de
commit c971cf439c
15 changed files with 45 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/client/windows/common/auto_critical_section.h
View file

@ -30,7 +30,7 @@
#ifndef CLIENT_WINDOWS_COMMON_AUTO_CRITICAL_SECTION_H__
#define CLIENT_WINDOWS_COMMON_AUTO_CRITICAL_SECTION_H__
#include <Windows.h>
#include <windows.h>
namespace google_breakpad {

4
src/client/windows/common/ipc_protocol.h
View file

@ -30,8 +30,8 @@
#ifndef CLIENT_WINDOWS_COMMON_IPC_PROTOCOL_H__
#define CLIENT_WINDOWS_COMMON_IPC_PROTOCOL_H__
#include <Windows.h>
#include <DbgHelp.h>
#include <windows.h>
#include <dbghelp.h>
#include <string>
#include <utility>
#include "common/windows/string_utils-inl.h"

4
src/client/windows/crash_generation/client_info.h
View file

@ -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"

9
src/client/windows/crash_generation/minidump_generator.cc
View file

@ -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,

1
src/client/windows/crash_generation/minidump_generator.h
View file

@ -34,6 +34,7 @@
#include <dbghelp.h>
#include <rpc.h>
#include <list>
#include <string>
#include "google_breakpad/common/minidump_format.h"
namespace google_breakpad {

2
src/client/windows/handler/exception_handler.cc
View file

@ -27,7 +27,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <ObjBase.h>
#include <objbase.h>
#include <algorithm>
#include <cassert>

4
src/client/windows/handler/exception_handler.h
View file

@ -57,8 +57,8 @@
#define CLIENT_WINDOWS_HANDLER_EXCEPTION_HANDLER_H__
#include <stdlib.h>
#include <Windows.h>
#include <DbgHelp.h>
#include <windows.h>
#include <dbghelp.h>
#include <rpc.h>
#pragma warning(push)