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/randr/rrdispatch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/randr/rrdispatch.c') diff --git a/nx-X11/programs/Xserver/randr/rrdispatch.c b/nx-X11/programs/Xserver/randr/rrdispatch.c index 3d52b3879..4c6a5ff48 100644 --- a/nx-X11/programs/Xserver/randr/rrdispatch.c +++ b/nx-X11/programs/Xserver/randr/rrdispatch.c @@ -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 *) xalloc (sizeof (RREventPtr)); if (!pHead || - !AddResource (pWin->drawable.id, RREventType, (pointer)pHead)) + !AddResource (pWin->drawable.id, RREventType, (void *)pHead)) { FreeResource (clientResource, RT_NONE); return BadAlloc; -- cgit v1.2.3