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/dix/inpututils.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'xorg-server/dix/inpututils.c') diff --git a/xorg-server/dix/inpututils.c b/xorg-server/dix/inpututils.c index a10a7c761..3e1d75fec 100644 --- a/xorg-server/dix/inpututils.c +++ b/xorg-server/dix/inpututils.c @@ -351,7 +351,7 @@ DuplicateInputAttributes(InputAttributes * attrs) { InputAttributes *new_attr; int ntags = 0; - char **tags, **new_tags; + const char **tags, **new_tags; if (!attrs) return NULL; @@ -403,20 +403,20 @@ DuplicateInputAttributes(InputAttributes * attrs) void FreeInputAttributes(InputAttributes * attrs) { - char **tags; + const char **tags; if (!attrs) return; - free(attrs->product); - free(attrs->vendor); - free(attrs->device); - free(attrs->pnp_id); - free(attrs->usb_id); + free((void *) attrs->product); + free((void *) attrs->vendor); + free((void *) attrs->device); + free((void *) attrs->pnp_id); + free((void *) attrs->usb_id); if ((tags = attrs->tags)) while (*tags) - free(*tags++); + free((void *) *tags++); free(attrs->tags); free(attrs); -- cgit v1.2.3