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/miext/cw/cw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'nx-X11/programs/Xserver/miext/cw/cw.c') diff --git a/nx-X11/programs/Xserver/miext/cw/cw.c b/nx-X11/programs/Xserver/miext/cw/cw.c index 0fdd6547e..8079a0009 100644 --- a/nx-X11/programs/Xserver/miext/cw/cw.c +++ b/nx-X11/programs/Xserver/miext/cw/cw.c @@ -64,7 +64,7 @@ cwCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst); static void cwDestroyGC(GCPtr pGC); static void -cwChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects); +cwChangeClip(GCPtr pGC, int type, void * pvalue, int nrects); static void cwCopyClip(GCPtr pgcDst, GCPtr pgcSrc); static void @@ -199,7 +199,7 @@ cwValidateGC(GCPtr pGC, unsigned long stateChanges, DrawablePtr pDrawable) */ (*pBackingGC->funcs->ChangeClip) (pBackingGC, CT_REGION, - (pointer) pCompositeClip, 0); + (void *) pCompositeClip, 0); vals[0] = x_off - pDrawable->x; vals[1] = y_off - pDrawable->y; @@ -273,7 +273,7 @@ cwDestroyGC(GCPtr pGC) } static void -cwChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects) +cwChangeClip(GCPtr pGC, int type, void * pvalue, int nrects) { cwGCPtr pPriv = (cwGCPtr)(pGC)->devPrivates[cwGCIndex].ptr; @@ -425,7 +425,7 @@ cwFillRegionTiled(DrawablePtr pDrawable, RegionPtr pRegion, PixmapPtr pTile, pGC = GetScratchGC(pDrawable->depth, pScreen); v[0].val = GXcopy; v[1].val = FillTiled; - v[2].ptr = (pointer) pTile; + v[2].ptr = (void *) pTile; v[3].val = x_off; v[4].val = y_off; dixChangeGC(NullClient, pGC, (GCFunction | GCFillStyle | GCTile | @@ -645,7 +645,7 @@ miInitializeCompositeWrapper(ScreenPtr pScreen) if (!pScreenPriv) return; - pScreen->devPrivates[cwScreenIndex].ptr = (pointer)pScreenPriv; + pScreen->devPrivates[cwScreenIndex].ptr = (void *)pScreenPriv; SCREEN_EPILOGUE(pScreen, CloseScreen, cwCloseScreen); SCREEN_EPILOGUE(pScreen, GetImage, cwGetImage); @@ -693,7 +693,7 @@ cwCloseScreen (int i, ScreenPtr pScreen) cwFiniRender(pScreen); #endif - xfree((pointer)pScreenPriv); + xfree((void *)pScreenPriv); return (*pScreen->CloseScreen)(i, pScreen); } -- cgit v1.2.3