summaryrefslogtreecommitdiff
path: root/xserver/xkb
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-12-21 20:10:50 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-12-21 20:10:50 +0000
commit239364510e41b034ad6ecb6cb51120232e7166cc (patch)
tree37c3c57c97d3fda8179a0204d94318a738309cc0 /xserver/xkb
parent9c0c4e62648084518b26f71ef3e5664454486b42 (diff)
Update to xorg-server 1.9.3. Tested by japser@, landry@ and ajacoutot@
in various configurations.
Diffstat (limited to 'xserver/xkb')
-rw-r--r--xserver/xkb/Makefile.in2
-rw-r--r--xserver/xkb/xkb.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/xserver/xkb/Makefile.in b/xserver/xkb/Makefile.in
index 6ef9af55c..7c788e649 100644
--- a/xserver/xkb/Makefile.in
+++ b/xserver/xkb/Makefile.in
@@ -218,6 +218,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@
ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@
+ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@
+ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FBDEVHW_FALSE = @FBDEVHW_FALSE@
diff --git a/xserver/xkb/xkb.c b/xserver/xkb/xkb.c
index 4105c1c6b..7d95bc0e3 100644
--- a/xserver/xkb/xkb.c
+++ b/xserver/xkb/xkb.c
@@ -2343,8 +2343,8 @@ _XkbSetMapChecks(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq *req, char* va
XkbDescPtr xkb;
int error;
int nTypes = 0, nActions;
- CARD8 mapWidths[XkbMaxLegalKeyCode + 1];
- CARD16 symsPerKey[XkbMaxLegalKeyCode + 1];
+ CARD8 mapWidths[XkbMaxLegalKeyCode + 1] = {0};
+ CARD16 symsPerKey[XkbMaxLegalKeyCode + 1] = {0};
xkbi= dev->key->xkbInfo;
xkb = xkbi->desc;