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/xkbtext.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/xkbtext.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbtext.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbtext.c b/nx-X11/programs/Xserver/xkb/xkbtext.c index dc1c712ae..0110b64e0 100644 --- a/nx-X11/programs/Xserver/xkb/xkbtext.c +++ b/nx-X11/programs/Xserver/xkb/xkbtext.c @@ -1271,7 +1271,6 @@ char buf[256],*tmp; } else if (type==XkbKB_RadioGroup) { int g; - char *tmp; g= ((behavior->data)&(~XkbKB_RGAllowNone))+1; if (XkbKB_RGAllowNone&behavior->data) { sprintf(buf,"allowNone,"); |