diff options
author | ted.mielczarek@gmail.com <ted.mielczarek@gmail.com> | 2014-11-03 17:05:39 +0000 |
---|---|---|
committer | ted.mielczarek@gmail.com <ted.mielczarek@gmail.com> | 2014-11-03 17:05:39 +0000 |
commit | c971cf439cec3d412e297199db2416523c1a889d (patch) | |
tree | 491b9867f0696cb5007d627c82fc183085effc5a /src/client/windows/crash_generation/minidump_generator.cc | |
parent | Introduce microdump writer class. (diff) | |
download | breakpad-c971cf439cec3d412e297199db2416523c1a889d.tar.xz |
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
Diffstat (limited to 'src/client/windows/crash_generation/minidump_generator.cc')
-rw-r--r-- | src/client/windows/crash_generation/minidump_generator.cc | 9 |
1 files changed, 7 insertions, 2 deletions
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, |