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/xf86dga2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/Xext/xf86dga2.c') diff --git a/nx-X11/programs/Xserver/Xext/xf86dga2.c b/nx-X11/programs/Xserver/Xext/xf86dga2.c index a5cab0f11..490554d9a 100644 --- a/nx-X11/programs/Xserver/Xext/xf86dga2.c +++ b/nx-X11/programs/Xserver/Xext/xf86dga2.c @@ -59,7 +59,7 @@ static DISPATCH_PROC(ProcXDGACreateColormap); static void XDGAResetProc(ExtensionEntry *extEntry); -static void DGAClientStateChange (CallbackListPtr*, pointer, pointer); +static void DGAClientStateChange (CallbackListPtr*, void *, void *); static ClientPtr DGAClients[MAXSCREENS]; @@ -291,8 +291,8 @@ ProcXDGAQueryModes(ClientPtr client) static void DGAClientStateChange ( CallbackListPtr* pcbl, - pointer nulldata, - pointer calldata + void * nulldata, + void * calldata ){ NewClientInfoRec* pci = (NewClientInfoRec*) calldata; ClientPtr client = NULL; @@ -370,7 +370,7 @@ ProcXDGASetMode(ClientPtr client) DGAClients[stuff->screen] = client; if(pPix) { - if(AddResource(stuff->pid, RT_PIXMAP, (pointer)(pPix))) { + if(AddResource(stuff->pid, RT_PIXMAP, (void *)(pPix))) { pPix->drawable.id = (int)stuff->pid; rep.flags = DGA_PIXMAP_AVAILABLE; } -- cgit v1.2.3