diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2020-01-09 22:41:53 +0100 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2020-01-10 00:25:46 +0100 |
| commit | ae180b6b52640512fcf0bf6b05bba3449b409640 (patch) | |
| tree | 8c014a5fed8afd2ca35bed302c6c478a07e4d604 /nx-X11/programs/Xserver/xkb/xkmread.c | |
| parent | 3c3e11cb02886d05694b72c29c3deca0e3170c71 (diff) | |
| download | nx-libs-ae180b6b52640512fcf0bf6b05bba3449b409640.tar.gz nx-libs-ae180b6b52640512fcf0bf6b05bba3449b409640.tar.bz2 nx-libs-ae180b6b52640512fcf0bf6b05bba3449b409640.zip | |
xkb: fix shadow warnings
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 <yselkowitz@users.sourceforge.net>
Date: Tue Oct 16 02:04:34 2012 -0500
xkb: fix shadow warnings
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkmread.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkmread.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkmread.c b/nx-X11/programs/Xserver/xkb/xkmread.c index b24c43e03..3bb4414e3 100644 --- a/nx-X11/programs/Xserver/xkb/xkmread.c +++ b/nx-X11/programs/Xserver/xkb/xkmread.c @@ -636,7 +636,6 @@ XkbDescPtr xkb; bzero((char *)typeName,XkbNumKbdGroups*sizeof(Atom)); bzero((char *)type,XkbNumKbdGroups*sizeof(XkbKeyTypePtr)); if (wireMap.flags&XkmKeyHasTypes) { - register int g; for (g=0;g<XkbNumKbdGroups;g++) { if ((wireMap.flags&(1<<g))&& ((tmp=XkmGetCountedString(file,buf,100))>0)) { |