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

1 files changed, 3 insertions, 3 deletions

diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index 117b8a31d..b4eb9dd6a 100644
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -771,18 +771,18 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             ErrorF("\nCYGWINDOWING Dump:\n"
                    "\tdrawable: (%hd, %hd) - %hdx%hd\n", pDraw->x,
                    pDraw->y, pDraw->width, pDraw->height);
-            ErrorF("\twindPlace: (%ld, %ld) - %ldx%ld\n", pRect->left,
+            ErrorF("\twindPlace: (%d, %d) - %dx%d\n", pRect->left,
                    pRect->top, pRect->right - pRect->left,
                    pRect->bottom - pRect->top);
             if (GetClientRect(hwnd, &rc)) {
                 pRect = &rc;
-                ErrorF("\tClientRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
+                ErrorF("\tClientRect: (%d, %d) - %dx%d\n", pRect->left,
                        pRect->top, pRect->right - pRect->left,
                        pRect->bottom - pRect->top);
             }
             if (GetWindowRect(hwnd, &rc)) {
                 pRect = &rc;
-                ErrorF("\tWindowRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
+                ErrorF("\tWindowRect: (%d, %d) - %dx%d\n", pRect->left,
                        pRect->top, pRect->right - pRect->left,
                        pRect->bottom - pRect->top);
             }