xserver: Branch 'master'

[Peter Hutterer]

 xkb/xkbInit.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5cdfcdef819efa6406807254cb3c7aba6ba5475e
Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu Mar 23 19:37:46 2017 -0700

    xkb: Correct type of XkbDfltAccessXOptions.
    
    Declared as unsigned short in xkb/xkbAccessX.c.
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 46016aba5..9e45b4b71 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -737,7 +737,7 @@ extern int XkbDfltRepeatInterval;
 extern unsigned short XkbDfltAccessXTimeout;
 extern unsigned int XkbDfltAccessXTimeoutMask;
 extern unsigned int XkbDfltAccessXFeedback;
-extern unsigned char XkbDfltAccessXOptions;
+extern unsigned short XkbDfltAccessXOptions;
 
 int
 XkbProcessArguments(int argc, char *argv[], int i)
@@ -798,7 +798,7 @@ XkbProcessArguments(int argc, char *argv[], int i)
                     j++;
                 }
                 if (((i + 1) < argc) && (isdigit(argv[i + 1][0]))) {
-                    XkbDfltAccessXOptions = (unsigned char)
+                    XkbDfltAccessXOptions = (unsigned short)
                         strtol(argv[++i], NULL, 16);
                     j++;
                 }