diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2015-02-09 12:54:21 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2015-02-09 12:54:21 +0000 |
| commit | 89f670364cdf575e65cd1c279dbed296ed203635 (patch) | |
| tree | 4cec57aca145fed1e4bc2f7479c48dd1ad5e022f /hw/xwin/winwndproc.c | |
| parent | c4e2c0cb66df2f1aaf7a5c1e872297f9a4306ca4 (diff) | |
| parent | 8cbaeed1d57103361524ca6083f467d5a505d039 (diff) | |
Merge branch 'cygwin-warning-fixes-for-1.17' into cygwin-patches-for-1.17xserver-cygwin-1.17.0-1
Conflicts:
hw/xwin/winclipboard/internal.h
hw/xwin/winclipboard/xevents.c
hw/xwin/winconfig.c
hw/xwin/winkeybd.c
Diffstat (limited to 'hw/xwin/winwndproc.c')
| -rw-r--r-- | hw/xwin/winwndproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index 999bea3c0..a8477aac8 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -171,7 +171,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) ErrorF("winWindowProc - WM_DISPLAYCHANGE - new width: %d " "new height: %d new bpp: %d\n", - LOWORD(lParam), HIWORD(lParam), wParam); + LOWORD(lParam), HIWORD(lParam), (int)wParam); /* 0 bpp has no defined meaning, ignore this message */ if (wParam == 0) |