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/dix/grabs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/dix/grabs.c') diff --git a/nx-X11/programs/Xserver/dix/grabs.c b/nx-X11/programs/Xserver/dix/grabs.c index 1d76f7f07..e133c0dfc 100644 --- a/nx-X11/programs/Xserver/dix/grabs.c +++ b/nx-X11/programs/Xserver/dix/grabs.c @@ -128,7 +128,7 @@ FreeGrab(GrabPtr pGrab) } int -DeletePassiveGrab(pointer value, XID id) +DeletePassiveGrab(void * value, XID id) { register GrabPtr g, prev; GrabPtr pGrab = (GrabPtr)value; @@ -295,7 +295,7 @@ AddPassiveGrabToList(GrabPtr pGrab) } pGrab->next = pGrab->window->optional->passiveGrabs; pGrab->window->optional->passiveGrabs = pGrab; - if (AddResource(pGrab->resource, RT_PASSIVEGRAB, (pointer)pGrab)) + if (AddResource(pGrab->resource, RT_PASSIVEGRAB, (void *)pGrab)) return Success; return BadAlloc; } @@ -389,7 +389,7 @@ DeletePassiveGrabFromList(GrabPtr pMinuendGrab) ok = FALSE; } else if (!AddResource(pNewGrab->resource, RT_PASSIVEGRAB, - (pointer)pNewGrab)) + (void *)pNewGrab)) ok = FALSE; else adds[nadds++] = pNewGrab; -- cgit v1.2.3