diff options
| author | Ted Mielczarek <ted@mielczarek.org> | 2015-10-06 08:03:57 -0400 |
|---|---|---|
| committer | Ted Mielczarek <ted@mielczarek.org> | 2015-10-06 08:03:57 -0400 |
| commit | dbf56c53a039cb91b6f2a7e00b3ac833509f5b92 (patch) | |
| tree | 13714d24cb9e5635a88d4411dcb2713146de2a73 /src/client | |
| parent | Increasing the Breakpad stack walker max scan limit from 30 to 40. (diff) | |
| download | breakpad-dbf56c53a039cb91b6f2a7e00b3ac833509f5b92.tar.xz | |
Fix MSVC build (including on 2015), drop some workarounds for MSVC older than 2013.
The Windows client gyp files were missing proc_maps_linux.cc for the
unittest build. Adding that revealed some build errors due to it
unconditionally including <inttypes.h>. Removing the workarounds in
breakpad_types.h (and a few other places) made that build, which means
that Visual C++ 2013 is now our minimum supported version of MSVC.
Additionally I tried building with VC++ 2015 and fixed a few warnings
(which were failing the build because we have /WX enabled) to ensure
that that builds as well.
BUG=https://code.google.com/p/google-breakpad/issues/detail?id=669
R=mark@chromium.org
Review URL: https://codereview.chromium.org/1353893002 .
Diffstat (limited to 'src/client')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/client/windows/tests/crash_generation_app/crash_generation_app.cc b/src/client/windows/tests/crash_generation_app/crash_generation_app.cc index ad395d6c..0d837e52 100644 --- a/src/client/windows/tests/crash_generation_app/crash_generation_app.cc +++ b/src/client/windows/tests/crash_generation_app/crash_generation_app.cc @@ -73,7 +73,7 @@ BOOL InitInstance(HINSTANCE, int); LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); INT_PTR CALLBACK About(HWND, UINT, WPARAM, LPARAM); -static int kCustomInfoCount = 2; +static size_t kCustomInfoCount = 2; static CustomInfoEntry kCustomInfoEntries[] = { CustomInfoEntry(L"prod", L"CrashTestApp"), CustomInfoEntry(L"ver", L"1.0"), diff --git a/src/client/windows/unittests/client_tests.gyp b/src/client/windows/unittests/client_tests.gyp index 7f9c7a02..b13603ef 100644 --- a/src/client/windows/unittests/client_tests.gyp +++ b/src/client/windows/unittests/client_tests.gyp @@ -73,6 +73,7 @@ '<(DEPTH)/processor/logging.cc', '<(DEPTH)/processor/minidump.cc', '<(DEPTH)/processor/pathname_stripper.cc', + '<(DEPTH)/processor/proc_maps_linux.cc', ] } ], diff --git a/src/client/windows/unittests/crash_generation_server_test.cc b/src/client/windows/unittests/crash_generation_server_test.cc index cf95d43f..b7b2b84f 100644 --- a/src/client/windows/unittests/crash_generation_server_test.cc +++ b/src/client/windows/unittests/crash_generation_server_test.cc @@ -50,9 +50,8 @@ const DWORD kPipeFlagsAndAttributes = SECURITY_IDENTIFICATION | const DWORD kPipeMode = PIPE_READMODE_MESSAGE; -int kCustomInfoCount = 2; - -google_breakpad::CustomInfoEntry kCustomInfoEntries[] = { +#define arraysize(f) (sizeof(f) / sizeof(*f)) +const google_breakpad::CustomInfoEntry kCustomInfoEntries[] = { google_breakpad::CustomInfoEntry(L"prod", L"CrashGenerationServerTest"), google_breakpad::CustomInfoEntry(L"ver", L"1.0"), }; @@ -165,7 +164,7 @@ class CrashGenerationServerTest : public ::testing::Test { } google_breakpad::CustomClientInfo custom_info = {kCustomInfoEntries, - kCustomInfoCount}; + arraysize(kCustomInfoEntries)}; google_breakpad::ProtocolMessage msg( fault_type == SEND_INVALID_REGISTRATION ? |