summaryrefslogtreecommitdiff
path: root/damageext
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-12-15 01:05:51 -0800
committerKeith Packard <keithp@keithp.com>2014-01-12 10:24:11 -0800
commit60014a4a98ff924ae7f6840781f768c1cc93bbab (patch)
treea956a03a6a7c87cac4d48fb95b66fec313d87fde /damageext
parent93fa64e17d7bd600ebf18ecab85f5b2d17fe30ce (diff)
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 <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'damageext')
-rw-r--r--damageext/damageext.c6
-rw-r--r--damageext/damageextint.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/damageext/damageext.c b/damageext/damageext.c
index 5650953f2..886f56d9e 100644
--- a/damageext/damageext.c
+++ b/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/damageext/damageextint.h b/damageext/damageextint.h
index e50149501..7a7096d27 100644
--- a/damageext/damageextint.h
+++ b/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; \