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/mi/mioverlay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/mi/mioverlay.c') diff --git a/nx-X11/programs/Xserver/mi/mioverlay.c b/nx-X11/programs/Xserver/mi/mioverlay.c index 545927b53..732e47af0 100644 --- a/nx-X11/programs/Xserver/mi/mioverlay.c +++ b/nx-X11/programs/Xserver/mi/mioverlay.c @@ -128,7 +128,7 @@ miInitOverlay( if(!(pScreenPriv = xalloc(sizeof(miOverlayScreenRec)))) return FALSE; - pScreen->devPrivates[miOverlayScreenIndex].ptr = (pointer)pScreenPriv; + pScreen->devPrivates[miOverlayScreenIndex].ptr = (void *)pScreenPriv; pScreenPriv->InOverlay = inOverlayFunc; pScreenPriv->MakeTransparent = transFunc; @@ -1105,7 +1105,7 @@ typedef struct { static int miOverlayRecomputeExposures ( WindowPtr pWin, - pointer value + void * value ){ register ScreenPtr pScreen; miOverlayTwoRegions *pValid = (miOverlayTwoRegions*)value; @@ -1503,7 +1503,7 @@ miOverlayResizeWindow( TwoRegions.under = gravitate2[g]; TraverseTree (pChild, miOverlayRecomputeExposures, - (pointer)(&TwoRegions)); + (void *)(&TwoRegions)); } /* -- cgit v1.2.3