diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 13:34:26 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 13:34:26 +0200 |
| commit | 381706aa279799201d5750bb971cac91e05db995 (patch) | |
| tree | 13abc7de22c00d7ab9080c47df749afbe94d8f85 /nx-X11/programs/Xserver/include/dix.h | |
| parent | 06a97857a0380f88b691ac022fa30a05d54e43e0 (diff) | |
| parent | f6a1bda2dff0c70aa13f3cb763a9b08c4c037c53 (diff) | |
| download | nx-libs-381706aa279799201d5750bb971cac91e05db995.tar.gz nx-libs-381706aa279799201d5750bb971cac91e05db995.tar.bz2 nx-libs-381706aa279799201d5750bb971cac91e05db995.zip | |
Merge branch 'sunweaver-pr/no-more-type-casting-in-writetoclient' into 3.6.x
Attributes GH PR #178: https://github.com/ArcticaProject/nx-libs/pull/178
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Tue, 05 Jul 2016 02:37:08 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/include/dix.h')
| -rw-r--r-- | nx-X11/programs/Xserver/include/dix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/include/dix.h b/nx-X11/programs/Xserver/include/dix.h index b7f91b6da..e68c71623 100644 --- a/nx-X11/programs/Xserver/include/dix.h +++ b/nx-X11/programs/Xserver/include/dix.h @@ -281,12 +281,12 @@ SOFTWARE. if ((pClient)->swapped) \ (*ReplySwapVector[((xReq *)(pClient)->requestBuffer)->reqType]) \ (pClient, (int)(size), pReply); \ - else (void) WriteToClient(pClient, (int)(size), (char *)(pReply)); } + else WriteToClient(pClient, (int)(size), (pReply)); } #define WriteSwappedDataToClient(pClient, size, pbuf) \ if ((pClient)->swapped) \ (*(pClient)->pSwapReplyFunc)(pClient, (int)(size), pbuf); \ - else (void) WriteToClient (pClient, (int)(size), (char *)(pbuf)); + else WriteToClient (pClient, (int)(size), (pbuf)); typedef struct _TimeStamp *TimeStampPtr; |