diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-15 21:23:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:23:25 +0100 |
| commit | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (patch) | |
| tree | d08c81de02b94da202195d84c99e192bc24ae69e /xorg-server/os/io.c | |
| parent | aaeb8bf497c82efabc4f9b27c319042c0e72d816 (diff) | |
| download | vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.gz vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.bz2 vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.zip | |
mesa xkeyboard-config xserver git update 15 jan 2014
xserver commit 2d2d49dab5c5718989de97d7227aac793479745e
xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad
mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43
Diffstat (limited to 'xorg-server/os/io.c')
| -rw-r--r-- | xorg-server/os/io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/os/io.c b/xorg-server/os/io.c index 922a8eb02..cf5e8f933 100644 --- a/xorg-server/os/io.c +++ b/xorg-server/os/io.c @@ -481,7 +481,7 @@ ReadRequestFromClient(ClientPtr client) oci->lenLastReq -= (sizeof(xBigReq) - sizeof(xReq)); client->req_len -= bytes_to_int32(sizeof(xBigReq) - sizeof(xReq)); } - client->requestBuffer = (pointer) oci->bufptr; + client->requestBuffer = (void *) oci->bufptr; #ifdef DEBUG_COMMUNICATION { xReq *req = client->requestBuffer; @@ -809,7 +809,7 @@ WriteToClient(ClientPtr who, int count, const void *__buf) who->replyBytesRemaining -= count + padBytes; replyinfo.startOfReply = FALSE; replyinfo.bytesRemaining = who->replyBytesRemaining; - CallCallbacks((&ReplyCallback), (pointer) &replyinfo); + CallCallbacks((&ReplyCallback), (void *) &replyinfo); } else if (who->clientState == ClientStateRunning && buf[0] == X_Reply) { /* start of new reply */ CARD32 replylen; @@ -821,7 +821,7 @@ WriteToClient(ClientPtr who, int count, const void *__buf) bytesleft = (replylen * 4) + SIZEOF(xReply) - count - padBytes; replyinfo.startOfReply = TRUE; replyinfo.bytesRemaining = who->replyBytesRemaining = bytesleft; - CallCallbacks((&ReplyCallback), (pointer) &replyinfo); + CallCallbacks((&ReplyCallback), (void *) &replyinfo); } } #ifdef DEBUG_COMMUNICATION |