diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-30 10:59:17 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-30 10:59:17 +0100 |
| commit | c8d69ebaeed8005d38c91613ab699747f45b2228 (patch) | |
| tree | cd93f7cdaa242660d2c19ea5514cd3f674aaeb75 /nx-X11/programs/Xserver/xkb/xkb.c | |
| parent | 105cd2be6dfce3579cb585a8d78f655f19cef57b (diff) | |
| parent | 4821edfe0ecc2296745c4c5fcaa4c08245673c6e (diff) | |
| download | nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.gz nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.bz2 nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.zip | |
Merge branch 'uli42-pr/fix_shadowed_vars' into 3.6.x
Attributes GH PR #895: https://github.com/ArcticaProject/nx-libs/pull/895
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkb.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkb.c | 21 |
1 files changed, 10 insertions, 11 deletions
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;n<type->map_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;n<type->map_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;i<XkbNumKbdGroups;i++,bit<<=1) { if (stuff->groups&bit) { |