diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-03-10 20:19:19 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-10 20:19:19 +0100 |
| commit | 320cece2e97035665d4df5e382ea45e5a7f07efa (patch) | |
| tree | e69e6342ece32a992ae29376697b4ecc691266de /nx-X11/programs/Xserver/record | |
| parent | dc8477f76372e685eb999a71afb4e5ec7e3176f1 (diff) | |
| parent | ee2a933c3d4ad65849443cc917c59ad479083ca8 (diff) | |
| download | nx-libs-320cece2e97035665d4df5e382ea45e5a7f07efa.tar.gz nx-libs-320cece2e97035665d4df5e382ea45e5a7f07efa.tar.bz2 nx-libs-320cece2e97035665d4df5e382ea45e5a7f07efa.zip | |
Merge branch 'uli42-pr/misc_cherries' into 3.6.x
Attributes GH PR #378: https://github.com/ArcticaProject/nx-libs/pull/378
Diffstat (limited to 'nx-X11/programs/Xserver/record')
| -rw-r--r-- | nx-X11/programs/Xserver/record/record.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/record/record.c b/nx-X11/programs/Xserver/record/record.c index bf3f9decb..df9419f22 100644 --- a/nx-X11/programs/Xserver/record/record.c +++ b/nx-X11/programs/Xserver/record/record.c @@ -711,7 +711,7 @@ RecordAReply(pcbl, nulldata, calldata) if (pContext->continuedReply) { RecordAProtocolElement(pContext, client, XRecordFromServer, - pri->replyData, pri->dataLenBytes, /* continuation */ -1); + (void *)pri->replyData, pri->dataLenBytes, /* continuation */ -1); if (!pri->bytesRemaining) pContext->continuedReply = 0; } @@ -721,7 +721,7 @@ RecordAReply(pcbl, nulldata, calldata) if (majorop <= 127) { /* core reply */ RecordAProtocolElement(pContext, client, XRecordFromServer, - pri->replyData, pri->dataLenBytes, pri->bytesRemaining); + (void *)pri->replyData, pri->dataLenBytes, pri->bytesRemaining); if (pri->bytesRemaining) pContext->continuedReply = 1; } @@ -742,7 +742,7 @@ RecordAReply(pcbl, nulldata, calldata) minorop)) { RecordAProtocolElement(pContext, client, - XRecordFromServer, pri->replyData, + XRecordFromServer, (void *)pri->replyData, pri->dataLenBytes, pri->bytesRemaining); if (pri->bytesRemaining) pContext->continuedReply = 1; |