frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/xwin: Fix using screenInfo as a formal parameter to InitOutput() shadows a global declaration 

Using screenInfo as a formal parameter to InitOutput() shadows a global declaration of screenInfo.
Change the formal parameter name from screenInfo to pScreenInfo, as everywhere else uses.

InitOutput.c: In function ‘InitOutput’:
InitOutput.c:891:25: error: declaration of ‘screenInfo’ shadows a global declaration
../../include/scrnintstr.h:570:19: error: shadowed declaration is here

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2012-01-25 19:17:16 +00:00
parent 97e9c34687
commit 47df98c785
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/xwin/InitOutput.c
View File

@ -897,7 +897,7 @@ ddxUseMsg(void)
*/ */
void void
InitOutput(ScreenInfo * screenInfo, int argc, char *argv[]) InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
{ {
int i; int i;
@ -940,15 +940,15 @@ InitOutput(ScreenInfo * screenInfo, int argc, char *argv[])
LoadPreferences(); LoadPreferences();
/* Setup global screen info parameters */ /* Setup global screen info parameters */
screenInfo->imageByteOrder = IMAGE_BYTE_ORDER; pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
screenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD; pScreenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
screenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT; pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
screenInfo->bitmapBitOrder = BITMAP_BIT_ORDER; pScreenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
screenInfo->numPixmapFormats = NUMFORMATS; pScreenInfo->numPixmapFormats = NUMFORMATS;
/* Describe how we want common pixmap formats padded */ /* Describe how we want common pixmap formats padded */
for (i = 0; i < NUMFORMATS; i++) { for (i = 0; i < NUMFORMATS; i++) {
screenInfo->formats[i] = g_PixmapFormats[i]; pScreenInfo->formats[i] = g_PixmapFormats[i];
} }
/* Load pointers to DirectDraw functions */ /* Load pointers to DirectDraw functions */