hw/xwin: Fix using menu as a formal parameter shadows a global variable of the same name
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:
parent
efe96a17bd
commit
97e9c34687
|
@ -283,16 +283,16 @@ SetTrayIcon (char *fname)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
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;
|
pref.rootMenuName[MENU_MAX] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
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.defaultSysMenuName[MENU_MAX] = 0;
|
||||||
pref.defaultSysMenuPos = pos;
|
pref.defaultSysMenuPos = pos;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user