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/os/connection.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/os/connection.c') diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c index e3319b338..0f846d084 100644 --- a/nx-X11/programs/Xserver/os/connection.c +++ b/nx-X11/programs/Xserver/os/connection.c @@ -142,7 +142,7 @@ extern __const__ int _nfiles; #endif #endif #endif /* WIN32 */ -#include "misc.h" /* for typedef of pointer */ +#include "misc.h" #include "osdep.h" #include #include "opaque.h" @@ -874,7 +874,7 @@ AllocNewConnection (XtransConnInfo trans_conn, int fd, CARD32 conn_time) oc->Close = Close; oc->largereq = (ConnectionInputPtr) NULL; #endif - if (!(client = NextAvailableClient((pointer)oc))) + if (!(client = NextAvailableClient((void *)oc))) { xfree (oc); return NullClient; @@ -950,7 +950,7 @@ LbxProxyConnection (ClientPtr client, LbxProxyPtr proxy) /*ARGSUSED*/ Bool -EstablishNewConnections(ClientPtr clientUnused, pointer closure) +EstablishNewConnections(ClientPtr clientUnused, void * closure) { fd_set readyconnections; /* set of listeners that are ready */ int curconn; /* fd of listener that's ready */ @@ -1215,7 +1215,7 @@ CloseDownConnection(ClientPtr client) FreeOsBuffers(oc); xfree(oc); #endif - client->osPrivate = (pointer)NULL; + client->osPrivate = (void *)NULL; if (auditTrailLevel > 1) AuditF("client %d disconnected\n", client->index); } -- cgit v1.2.3