From ae180b6b52640512fcf0bf6b05bba3449b409640 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 9 Jan 2020 22:41:53 +0100 Subject: xkb: fix shadow warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit xkb.c: In function ‘ProcXkbSetCompatMap’: xkb.c:2601:20: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local] register unsigned i,bit; ^ xkb.c:2529:23: note: shadowed declaration is here register unsigned i,bit; ^ xkb.c:2601:22: warning: declaration of ‘bit’ shadows a previous local [-Wshadow=compatible-local] register unsigned i,bit; ^~~ xkb.c:2529:25: note: shadowed declaration is here register unsigned i,bit; ^~~ Backport of this xorg upstream commit: commit 344eea237fc07dedfd733d14f95ed0ad26bb5f81 Author: Yaakov Selkowitz Date: Tue Oct 16 02:04:34 2012 -0500 xkb: fix shadow warnings Signed-off-by: Yaakov Selkowitz Reviewed-by: Peter Hutterer --- nx-X11/programs/Xserver/xkb/xkb.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'nx-X11/programs/Xserver/xkb/xkb.c') diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index 238b0897e..7b392fa09 100644 --- a/nx-X11/programs/Xserver/xkb/xkb.c +++ b/nx-X11/programs/Xserver/xkb/xkb.c @@ -876,21 +876,21 @@ XkbWriteKeyTypes( XkbDescPtr xkb, buf= (char *)&wire[1]; if (wire->nMapEntries>0) { - xkbKTMapEntryWireDesc * wire; + xkbKTMapEntryWireDesc * ewire; XkbKTMapEntryPtr entry; - wire= (xkbKTMapEntryWireDesc *)buf; + ewire= (xkbKTMapEntryWireDesc *)buf; entry= type->map; - for (n=0;nmap_count;n++,wire++,entry++) { - wire->active= entry->active; - wire->mask= entry->mods.mask; - wire->level= entry->level; - wire->realMods= entry->mods.real_mods; - wire->virtualMods= entry->mods.vmods; + for (n=0;nmap_count;n++,ewire++,entry++) { + ewire->active= entry->active; + ewire->mask= entry->mods.mask; + ewire->level= entry->level; + ewire->realMods= entry->mods.real_mods; + ewire->virtualMods= entry->mods.vmods; if (client->swapped) { - swaps(&wire->virtualMods); + swaps(&ewire->virtualMods); } } - buf= (char *)wire; + buf= (char *)ewire; if (type->preserve!=NULL) { xkbModsWireDesc * pwire; XkbModsPtr preserve; @@ -2598,7 +2598,6 @@ ProcXkbSetCompatMap(ClientPtr client) } if (stuff->groups!=0) { - register unsigned i,bit; xkbModsWireDesc *wire = (xkbModsWireDesc *)data; for (i=0,bit=1;igroups&bit) { -- cgit v1.2.3