From d75195b62677f5b0f17bbe089b3aea5b295d5f2c Mon Sep 17 00:00:00 2001 From: Colin Harrison Date: Fri, 28 Feb 2014 14:20:48 +0000 Subject: [PATCH] hw/xwin: Align parameter names in prototypes with definition A follow up to commits 2d9123fd, 451c5d91 and efe96a17, which changed the parameter name in the definition from index to i, to fix shadowing index() but didn't adjust the prototype declaration. Signed-off-by: Colin Harrison Reviewed-by: Jon TURNEY --- hw/xwin/win.h | 6 +++--- hw/xwin/winmonitors.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 0adb227..80fc504 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -751,7 +751,7 @@ Bool winAllocatePrivates(ScreenPtr pScreen); Bool - winInitCmapPrivates(ColormapPtr pCmap, int index); + winInitCmapPrivates(ColormapPtr pCmap, int i); Bool winAllocateCmapPrivates(ColormapPtr pCmap); @@ -1056,12 +1056,12 @@ Bool winScreenInit(ScreenPtr pScreen, int argc, char **argv); Bool - winFinishScreenInitFB(int index, ScreenPtr pScreen, int argc, char **argv); + winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv); #if defined(XWIN_NATIVEGDI) Bool -winFinishScreenInitNativeGDI(int index, +winFinishScreenInitNativeGDI(int i, ScreenPtr pScreen, int argc, char **argv); #endif diff --git a/hw/xwin/winmonitors.h b/hw/xwin/winmonitors.h index 8201e47..5fe3ecd 100644 --- a/hw/xwin/winmonitors.h +++ b/hw/xwin/winmonitors.h @@ -40,4 +40,4 @@ struct GetMonitorInfoData { HMONITOR monitorHandle; }; -Bool QueryMonitor(int index, struct GetMonitorInfoData *data); +Bool QueryMonitor(int i, struct GetMonitorInfoData *data); -- 2.7.4