commit 64c86ffe66e792ea615f49ebb0d948bf1ec883ee
author Marcus Meissner <marcus@jet.franken.de> Mon Aug 07 04:16:43 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Aug 07 04:16:43 2000 +0000
tree 12afab9565a02ddb8b6ee01cf1cb1045d8d20202
parent 081ee94117e7d903a20b78509ad56f4182d5588e

Removed local variable shadows warnings.

windows/cursoricon.c

diff --git a/windows/cursoricon.c b/windows/cursoricon.c
index 0293578..bd78baa 100644
--- a/windows/cursoricon.c
+++ b/windows/cursoricon.c
@@ -523,7 +523,7 @@
 		CBM_INIT, (char*)bmi + size, pInfo, DIB_RGB_COLORS );
 	    if( hXorBits )
 	    {
-		char* bits = (char *)bmi + size +
+		char* xbits = (char *)bmi + size +
 			DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth,
 					     bmi->bmiHeader.biHeight,
 					     bmi->bmiHeader.biBitCount) / 2;
@@ -558,14 +558,14 @@
 		  hOld = SelectObject(hMem, hAndBits);
 	          res = StretchDIBits(hMem, 0, 0, width, height, 0, 0,
 		    pInfo->bmiHeader.biWidth, pInfo->bmiHeader.biHeight,
-		    bits, pInfo, DIB_RGB_COLORS, SRCCOPY);
+		    xbits, pInfo, DIB_RGB_COLORS, SRCCOPY);
 		  SelectObject(hMem, hOld);
 		  DeleteDC(hMem);
 	        } else res = FALSE;
 		if (!res) { DeleteObject(hAndBits); hAndBits = 0; }
 	      }
 	    } else hAndBits = CreateDIBitmap( hdc, &pInfo->bmiHeader,
-	      CBM_INIT, bits, pInfo, DIB_RGB_COLORS );
+	      CBM_INIT, xbits, pInfo, DIB_RGB_COLORS );
 
 		if( !hAndBits ) DeleteObject( hXorBits );
 	    }