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/mbufpx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/Xext/mbufpx.c') diff --git a/nx-X11/programs/Xserver/Xext/mbufpx.c b/nx-X11/programs/Xserver/Xext/mbufpx.c index c986217ee..0973fc324 100644 --- a/nx-X11/programs/Xserver/Xext/mbufpx.c +++ b/nx-X11/programs/Xserver/Xext/mbufpx.c @@ -124,7 +124,7 @@ pixMultibufferInit(pScreen, pMBScreen) xfree(pInfo); return (FALSE); } - pMBScreen->devPrivate.ptr = (pointer) pMBPriv; + pMBScreen->devPrivate.ptr = (void *) pMBPriv; pMBPriv->PositionWindow = NULL; pMBPriv->funcsWrapped = 0; @@ -162,7 +162,7 @@ pixCreateImageBuffers (pWin, nbuf, ids, action, hint) break; if (!AddResource (ids[i], MultibufferDrawableResType, - (pointer) pMBBuffer->pDrawable)) + (void *) pMBBuffer->pDrawable)) { (*pScreen->DestroyPixmap) ((PixmapPtr) pMBBuffer->pDrawable); break; @@ -570,7 +570,7 @@ pixPositionWindow (pWin, x, y) { ChangeResourceValue (pPixmap->drawable.id, MultibufferDrawableResType, - (pointer) pPixmap); + (void *) pPixmap); } } FreeScratchGC (pGC); -- cgit v1.2.3