aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkb
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-11-20 16:33:58 +0100
committermarha <marha@users.sourceforge.net>2012-11-20 16:37:03 +0100
commitfc83ab987c84518c31793515c4f99a0df8ccd1cc (patch)
tree2f8e01251e2faba8369f28b85ba9c48de87136c6 /xorg-server/xkb
parent96f2a4b36eb811fa1f12dcde03bffc86cfd1781d (diff)
downloadvcxsrv-fc83ab987c84518c31793515c4f99a0df8ccd1cc.tar.gz
vcxsrv-fc83ab987c84518c31793515c4f99a0df8ccd1cc.tar.bz2
vcxsrv-fc83ab987c84518c31793515c4f99a0df8ccd1cc.zip
Solved compile problems due to latest merge
Diffstat (limited to 'xorg-server/xkb')
-rwxr-xr-x[-rw-r--r--]xorg-server/xkb/makefile3
-rwxr-xr-xxorg-server/xkb/xkb.c16
2 files changed, 9 insertions, 10 deletions
diff --git a/xorg-server/xkb/makefile b/xorg-server/xkb/makefile
index e04599e52..71a327c8e 100644..100755
--- a/xorg-server/xkb/makefile
+++ b/xorg-server/xkb/makefile
@@ -4,8 +4,7 @@ DDX_SRCS = \
ddxBeep.c \
ddxCtrls.c \
ddxLEDs.c \
- ddxLoad.c \
- ddxList.c
+ ddxLoad.c
DIX_SRCS = \
xkb.c \
diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c
index 17dab8ec9..d27d90d7e 100755
--- a/xorg-server/xkb/xkb.c
+++ b/xorg-server/xkb/xkb.c
@@ -5645,14 +5645,14 @@ ProcXkbListComponents(ClientPtr client)
rep.type = X_Reply;
rep.deviceID = dev->id;
rep.sequenceNumber = client->sequence;
- rep.length = 0,
- rep.nKeymaps = 0,
- rep.nKeycodes = 0,
- rep.nTypes = 0,
- rep.nCompatMaps = 0,
- rep.nSymbols = 0,
- rep.nGeometries = 0,
- rep.extra = 0
+ rep.length = 0;
+ rep.nKeymaps = 0;
+ rep.nKeycodes = 0;
+ rep.nTypes = 0;
+ rep.nCompatMaps = 0;
+ rep.nSymbols = 0;
+ rep.nGeometries = 0;
+ rep.extra = 0;
if (client->swapped) {
swaps(&rep.sequenceNumber);