Clears gcc warning:
setxkbmap.c: In function `tryLoadRules':
setxkbmap.c:811: warning: declaration of 'rules' shadows a global declaration
setxkbmap.c:132: warning: shadowed declaration is here
No longer marked static, since the function is called exactly once, so
storing the value across calls seems pointless.
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
---
setxkbmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setxkbmap.c b/setxkbmap.c
index cde779c..b573b14 100644
--- a/setxkbmap.c
+++ b/setxkbmap.c
@@ -129,7 +129,6 @@ static settings_t settings = {
static XkbConfigRtrnRec cfgResult;
-static XkbRF_RulesPtr rules = NULL;
static XkbRF_VarDefsRec rdefs;
static Bool clearOptions = False;
@@ -829,6 +828,7 @@ applyRules(void)
{
int i;
char *rfName;
+ XkbRF_RulesPtr rules = NULL;
if (settings.model.src || settings.layout.src || settings.variant.src
|| options.item)
--
1.7.9.2
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
