From b55d0b92fc536793a877f6073754801a7c3c2dd5 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Wed, 25 Jan 2012 18:56:22 +0000 Subject: [PATCH] hw/xwin: Fix shadowed local variables in winLoadCursor() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move shadowed local variables x and y to the places they are used wincursor.c: In function ‘winLoadCursor’: wincursor.c:212:11: error: declaration of ‘x’ shadows a previous local wincursor.c:166:7: error: shadowed declaration is here wincursor.c:212:14: error: declaration of ‘y’ shadows a previous local wincursor.c:166:10: error: shadowed declaration is here wincursor.c:228:11: error: declaration of ‘x’ shadows a previous local wincursor.c:166:7: error: shadowed declaration is here wincursor.c:228:14: error: declaration of ‘y’ shadows a previous local wincursor.c:166:10: error: shadowed declaration is here Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/wincursor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c index b56104fde..b5ea0db1b 100644 --- a/hw/xwin/wincursor.c +++ b/hw/xwin/wincursor.c @@ -158,7 +158,6 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen) HBITMAP hAnd, hXor; ICONINFO ii; unsigned char *pCur; - int x, y; unsigned char bit; HDC hDC; BITMAPV4HEADER bi; @@ -262,6 +261,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen) sizeof(unsigned long)); if (lpBits) { + int y; for (y = 0; y < nCY; y++) { unsigned long *src, *dst; @@ -305,6 +305,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen) pCur = (unsigned char *) lpBits; if (lpBits) { + int x, y; for (y = 0; y < pScreenPriv->cursor.sm_cy; y++) { for (x = 0; x < pScreenPriv->cursor.sm_cx; x++) { if (x >= nCX || y >= nCY) /* Outside of X11 icon bounds */