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/xkbPrKeyEv.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/xkbPrKeyEv.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c b/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c index 253b4654e..a26cd88c2 100644 --- a/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c +++ b/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c @@ -117,12 +117,12 @@ unsigned ndx; return; } if ( rg->currentDown!=0 ) { - int key = xE->u.u.detail; + int tmpkey = xE->u.u.detail; xE->u.u.type= KeyRelease; xE->u.u.detail= rg->currentDown; XkbHandleActions(keybd,keybd,xE,count); xE->u.u.type= KeyPress; - xE->u.u.detail= key; + xE->u.u.detail= tmpkey; } rg->currentDown= key; } |