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>