summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2012-01-25 19:09:12 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-10-16 21:23:29 +0100
commit451c5d9175cdeb36fd614502ff0317f968490dfc (patch)
tree4625264c2254edcf4f22dca3d97552849cd1528a
parent21faee4b383a12bef58f300b4ad1a3bd34d6de2d (diff)
hw/xwin: Fix using index as a formal parameter in winscrinit.c shadows index()
Using index as a local variable shadows index() from strings.h winscrinit.c: In function ‘winFinishScreenInitFB’: winscrinit.c:274:28: error: declaration of ‘index’ shadows a global declaration winscrinit.c: In function ‘winFinishScreenInitNativeGDI’: winscrinit.c:623:35: error: declaration of ‘index’ shadows a global declaration Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
-rw-r--r--hw/xwin/winscrinit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index be25f12af..639a99ca3 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -254,7 +254,7 @@ winCreateScreenResources(ScreenPtr pScreen)
/* See Porting Layer Definition - p. 20 */
Bool
-winFinishScreenInitFB(int index, ScreenPtr pScreen, int argc, char **argv)
+winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
{
winScreenPriv(pScreen);
winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
@@ -578,11 +578,11 @@ winFinishScreenInitFB(int index, ScreenPtr pScreen, int argc, char **argv)
/* See Porting Layer Definition - p. 20 */
Bool
-winFinishScreenInitNativeGDI(int index,
+winFinishScreenInitNativeGDI(int i,
ScreenPtr pScreen, int argc, char **argv)
{
winScreenPriv(pScreen);
- winScreenInfoPtr pScreenInfo = &g_ScreenInfo[index];
+ winScreenInfoPtr pScreenInfo = &g_ScreenInfo[i];
VisualPtr pVisuals = NULL;
DepthPtr pDepths = NULL;
VisualID rootVisual = 0;