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/damageext/damageext.c | 6 +++--- xorg-server/damageext/damageextint.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'xorg-server/damageext') diff --git a/xorg-server/damageext/damageext.c b/xorg-server/damageext/damageext.c index 5650953f2..886f56d9e 100644 --- a/xorg-server/damageext/damageext.c +++ b/xorg-server/damageext/damageext.c @@ -245,7 +245,7 @@ DamageExtCreate(DrawablePtr pDrawable, DamageReportLevel level, return NULL; } - if (!AddResource(id, DamageExtType, (pointer) pDamageExt)) + if (!AddResource(id, DamageExtType, (void *) pDamageExt)) return NULL; DamageExtRegister(pDrawable, pDamageExt->pDamage, @@ -569,7 +569,7 @@ SProcDamageDispatch(ClientPtr client) } static void -DamageClientCallback(CallbackListPtr *list, pointer closure, pointer data) +DamageClientCallback(CallbackListPtr *list, void *closure, void *data) { NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; ClientPtr pClient = clientinfo->client; @@ -587,7 +587,7 @@ DamageResetProc(ExtensionEntry * extEntry) } static int -FreeDamageExt(pointer value, XID did) +FreeDamageExt(void *value, XID did) { DamageExtPtr pDamageExt = (DamageExtPtr) value; diff --git a/xorg-server/damageext/damageextint.h b/xorg-server/damageext/damageextint.h index e50149501..7a7096d27 100644 --- a/xorg-server/damageext/damageextint.h +++ b/xorg-server/damageext/damageextint.h @@ -58,7 +58,7 @@ typedef struct _DamageExt { } DamageExtRec, *DamageExtPtr; #define VERIFY_DAMAGEEXT(pDamageExt, rid, client, mode) { \ - int rc = dixLookupResourceByType((pointer *)&(pDamageExt), rid, \ + int rc = dixLookupResourceByType((void **)&(pDamageExt), rid, \ DamageExtType, client, mode); \ if (rc != Success) \ return rc; \ -- cgit v1.2.3