andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/xwin: Fix using menu as a formal parameter shadows a global variable of the same name

Browse Source 
Using menu as a formal parameter shadows a global variable of the same name

winprefsyacc.y: In function ‘SetRootMenu’:
winprefsyacc.y:286:20: error: declaration of ‘menu’ shadows a global declaration
winprefsyacc.y:55:19: error: shadowed declaration is here
winprefsyacc.y: In function ‘SetDefaultSysMenu’:
winprefsyacc.y:293:26: error: declaration of ‘menu’ shadows a global declaration
winprefsyacc.y:55: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:07:49 +00:00
parent efe96a17bd
commit 97e9c34687
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xwin/winprefsyacc.y
View File

@ -283,16 +283,16 @@ SetTrayIcon (char *fname)
}
static void
SetRootMenu (char *menu)
SetRootMenu (char *menuname)
{
strncpy (pref.rootMenuName, menu, MENU_MAX);
strncpy (pref.rootMenuName, menuname, MENU_MAX);
pref.rootMenuName[MENU_MAX] = 0;
}
static void
SetDefaultSysMenu (char *menu, int pos)
SetDefaultSysMenu (char *menuname, int pos)
{
strncpy (pref.defaultSysMenuName, menu, MENU_MAX);
strncpy (pref.defaultSysMenuName, menuname, MENU_MAX);
pref.defaultSysMenuName[MENU_MAX] = 0;
pref.defaultSysMenuPos = pos;
}