From 1b0fcca503ae9cf2d462b60770f96c794dfbb27a Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 15 Jan 2014 21:23:25 +0100 Subject: mesa xkeyboard-config xserver git update 15 jan 2014 xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43 --- xorg-server/os/connection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xorg-server/os/connection.c') diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c index 162e1d93e..ddf4f0a3a 100644 --- a/xorg-server/os/connection.c +++ b/xorg-server/os/connection.c @@ -760,7 +760,7 @@ AllocNewConnection(XtransConnInfo trans_conn, int fd, CARD32 conn_time) oc->output = (ConnectionOutputPtr) NULL; oc->auth_id = None; oc->conn_time = conn_time; - if (!(client = NextAvailableClient((pointer) oc))) { + if (!(client = NextAvailableClient((void *) oc))) { free(oc); return NullClient; } @@ -798,7 +798,7 @@ AllocNewConnection(XtransConnInfo trans_conn, int fd, CARD32 conn_time) *****************/ /*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 */ @@ -1046,7 +1046,7 @@ CloseDownConnection(ClientPtr client) CloseDownFileDescriptor(oc); FreeOsBuffers(oc); free(client->osPrivate); - client->osPrivate = (pointer) NULL; + client->osPrivate = (void *) NULL; if (auditTrailLevel > 1) AuditF("client %d disconnected\n", client->index); } -- cgit v1.2.3