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/Xext/mbufbf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/Xext/mbufbf.c') diff --git a/nx-X11/programs/Xserver/Xext/mbufbf.c b/nx-X11/programs/Xserver/Xext/mbufbf.c index 8585c52d2..84e7ee839 100644 --- a/nx-X11/programs/Xserver/Xext/mbufbf.c +++ b/nx-X11/programs/Xserver/Xext/mbufbf.c @@ -230,7 +230,7 @@ bufMultibufferInit(pScreen, pMBScreen) if (!pMBPriv) return (FALSE); - pMBScreen->devPrivate.ptr = (pointer) pMBPriv; + pMBScreen->devPrivate.ptr = (void *) pMBPriv; pMBPriv->frameBuffer = bufFrameBuffer[pScreen->myNum]; pMBPriv->selectPlane = bufselectPlane[pScreen->myNum]; @@ -374,7 +374,7 @@ bufCreateImageBuffers (pWin, nbuf, ids, action, hint) pMBScreen = MB_SCREEN_PRIV(pScreen); pMBWindow = MB_WINDOW_PRIV(pWin); - pMBWindow->devPrivate.ptr = (pointer) REGION_CREATE(pScreen, 0,0); + pMBWindow->devPrivate.ptr = (void *) REGION_CREATE(pScreen, 0,0); if (!pMBWindow->devPrivate.ptr) return(0); REGION_COPY(pScreen, (RegionPtr) pMBWindow->devPrivate.ptr, @@ -389,7 +389,7 @@ bufCreateImageBuffers (pWin, nbuf, ids, action, hint) break; if (!AddResource (ids[i], MultibufferDrawableResType, - (pointer) pMBBuffer->pDrawable)) + (void *) pMBBuffer->pDrawable)) { bufDestroyBuffer((BufferPtr) pMBBuffer->pDrawable); break; -- cgit v1.2.3