summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2012-01-25 19:07:49 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-10-16 21:24:23 +0100
commit97e9c34687f7dc05ee0bdef097a19e7623fb59a3 (patch)
tree3d4bb939abd8b376112a7833d141b120a9c38bff
parentefe96a17bd741f222ccb226d306b5c1dc1f25ade (diff)
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>
-rw-r--r--hw/xwin/winprefsyacc.y8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/xwin/winprefsyacc.y b/hw/xwin/winprefsyacc.y
index 19c2f4067..3b376b3e7 100644
--- a/hw/xwin/winprefsyacc.y
+++ b/hw/xwin/winprefsyacc.y
@@ -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;
}