From 68dd0b52e13c844d662192654fb10cb993257a59 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 22 Jun 2015 09:36:08 +0200 Subject: Replace 'pointer' type with 'void *' This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer' is used throughout the X server for other things, and having duplicate names generates compiler warnings. Signed-off-by: Keith Packard Reviewed-by: Eric Anholt Rebased against NX: Mike Gabriel --- nx-X11/programs/Xserver/damageext/damageext.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/damageext/damageext.c') diff --git a/nx-X11/programs/Xserver/damageext/damageext.c b/nx-X11/programs/Xserver/damageext/damageext.c index 24809347a..33cbb5f7b 100755 --- a/nx-X11/programs/Xserver/damageext/damageext.c +++ b/nx-X11/programs/Xserver/damageext/damageext.c @@ -216,7 +216,7 @@ ProcDamageCreate (ClientPtr client) xfree (pDamageExt); return BadAlloc; } - if (!AddResource (stuff->damage, DamageExtType, (pointer) pDamageExt)) + if (!AddResource (stuff->damage, DamageExtType, (void *) pDamageExt)) return BadAlloc; DamageRegister (pDamageExt->pDrawable, pDamageExt->pDamage); @@ -376,8 +376,8 @@ SProcDamageDispatch (ClientPtr client) static void DamageClientCallback (CallbackListPtr *list, - pointer closure, - pointer data) + void * closure, + void * data) { NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; ClientPtr pClient = clientinfo->client; @@ -396,7 +396,7 @@ DamageResetProc (ExtensionEntry *extEntry) } static int -FreeDamageExt (pointer value, XID did) +FreeDamageExt (void * value, XID did) { DamageExtPtr pDamageExt = (DamageExtPtr) value; @@ -416,7 +416,7 @@ FreeDamageExt (pointer value, XID did) } static int -FreeDamageExtWin (pointer value, XID wid) +FreeDamageExtWin (void * value, XID wid) { DamageExtPtr pDamageExt = (DamageExtPtr) value; -- cgit v1.2.3