From 1b0fcca503ae9cf2d462b60770f96c794dfbb27a Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 15 Jan 2014 21:23:25 +0100 Subject: mesa xkeyboard-config xserver git update 15 jan 2014 xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43 --- xorg-server/xkb/xkbInit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'xorg-server/xkb/xkbInit.c') diff --git a/xorg-server/xkb/xkbInit.c b/xorg-server/xkb/xkbInit.c index f72655fc3..22b971fc6 100644 --- a/xorg-server/xkb/xkbInit.c +++ b/xorg-server/xkb/xkbInit.c @@ -129,11 +129,11 @@ XkbFreeRMLVOSet(XkbRMLVOSet * rmlvo, Bool freeRMLVO) if (!rmlvo) return; - free(rmlvo->rules); - free(rmlvo->model); - free(rmlvo->layout); - free(rmlvo->variant); - free(rmlvo->options); + free((void *) rmlvo->rules); + free((void *) rmlvo->model); + free((void *) rmlvo->layout); + free((void *) rmlvo->variant); + free((void *) rmlvo->options); if (freeRMLVO) free(rmlvo); @@ -142,7 +142,7 @@ XkbFreeRMLVOSet(XkbRMLVOSet * rmlvo, Bool freeRMLVO) } static Bool -XkbWriteRulesProp(ClientPtr client, pointer closure) +XkbWriteRulesProp(ClientPtr client, void *closure) { int len, out; Atom name; -- cgit v1.2.3