aboutsummaryrefslogtreecommitdiff
path: root/src/client/windows
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2014-01-21 19:22:37 +0000
committerthestig@chromium.org <thestig@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2014-01-21 19:22:37 +0000
commitc590a7f3227268f09264ace4932e193d0d7b93a6 (patch)
treec5e23b851dd7cf807f3856129b1366e006810280 /src/client/windows
parentFix missing semi-colons from r1267. (diff)
downloadbreakpad-c590a7f3227268f09264ace4932e193d0d7b93a6.tar.xz
Windows: Fix 64-bit compitation of crash_generation_app.
BUG=560 R=mark@chromium.org Review URL: https://breakpad.appspot.com/1104002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1276 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/windows')
-rw-r--r--src/client/windows/tests/crash_generation_app/crash_generation_app.cc8
1 files changed, 1 insertions, 7 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 12449ce9..7a6c1a97 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
@@ -357,13 +357,7 @@ LRESULT CALLBACK WndProc(HWND wnd,
PAINTSTRUCT ps;
HDC hdc;
-#pragma warning(push)
-#pragma warning(disable:4312)
- // Disable warning C4312: 'type cast' : conversion from 'LONG' to
- // 'HINSTANCE' of greater size.
- // The value returned by GetwindowLong in the case below returns unsigned.
- HINSTANCE instance = (HINSTANCE)GetWindowLong(wnd, GWL_HINSTANCE);
-#pragma warning(pop)
+ HINSTANCE instance = (HINSTANCE)GetWindowLongPtr(wnd, GWLP_HINSTANCE);
switch (message) {
case WM_COMMAND: