diff options
author | Keith Packard <keithp@keithp.com> | 2013-12-15 01:05:51 -0800 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2014-01-12 10:24:11 -0800 |
commit | 60014a4a98ff924ae7f6840781f768c1cc93bbab (patch) | |
tree | a956a03a6a7c87cac4d48fb95b66fec313d87fde /randr/rrdispatch.c | |
parent | 93fa64e17d7bd600ebf18ecab85f5b2d17fe30ce (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 'randr/rrdispatch.c')
-rw-r--r-- | randr/rrdispatch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c index 7fbc9f01c..b9346d3f9 100644 --- a/randr/rrdispatch.c +++ b/randr/rrdispatch.c @@ -83,7 +83,7 @@ ProcRRSelectInput(ClientPtr client) rc = dixLookupWindow(&pWin, stuff->window, client, DixReceiveAccess); if (rc != Success) return rc; - rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id, + rc = dixLookupResourceByType((void **) &pHead, pWin->drawable.id, RREventType, client, DixWriteAccess); if (rc != Success && rc != BadValue) return rc; @@ -120,7 +120,7 @@ ProcRRSelectInput(ClientPtr client) */ clientResource = FakeClientID(client->index); pRREvent->clientResource = clientResource; - if (!AddResource(clientResource, RRClientType, (pointer) pRREvent)) + if (!AddResource(clientResource, RRClientType, (void *) pRREvent)) return BadAlloc; /* * create a resource to contain a pointer to the list @@ -132,7 +132,7 @@ ProcRRSelectInput(ClientPtr client) pHead = (RREventPtr *) malloc(sizeof(RREventPtr)); if (!pHead || !AddResource(pWin->drawable.id, RREventType, - (pointer) pHead)) { + (void *) pHead)) { FreeResource(clientResource, RT_NONE); return BadAlloc; } |