From fc83ab987c84518c31793515c4f99a0df8ccd1cc Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 20 Nov 2012 16:33:58 +0100 Subject: Solved compile problems due to latest merge --- xorg-server/xkb/makefile | 3 +-- xorg-server/xkb/xkb.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) mode change 100644 => 100755 xorg-server/xkb/makefile (limited to 'xorg-server/xkb') diff --git a/xorg-server/xkb/makefile b/xorg-server/xkb/makefile old mode 100644 new mode 100755 index e04599e52..71a327c8e --- 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); -- cgit v1.2.3