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/GL/glx/unpack.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/GL/glx/unpack.h')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/unpack.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/GL/glx/unpack.h b/nx-X11/programs/Xserver/GL/glx/unpack.h index d1150c32b..154b4d286 100644 --- a/nx-X11/programs/Xserver/GL/glx/unpack.h +++ b/nx-X11/programs/Xserver/GL/glx/unpack.h @@ -69,7 +69,7 @@ extern xGLXSingleReply __glXReply; __glXReply.sequenceNumber = client->sequence; #define __GLX_SEND_HEADER() \ - WriteToClient( client, sz_xGLXSingleReply, (char *)&__glXReply); + WriteToClient( client, sz_xGLXSingleReply, &__glXReply); #define __GLX_PUT_RETVAL(a) \ __glXReply.retval = (a); @@ -123,19 +123,19 @@ extern xGLXSingleReply __glXReply; *(GLdouble *)&__glXReply.pad3 = *(GLdouble *)answer #define __GLX_SEND_BYTE_ARRAY(len) \ - WriteToClient(client, __GLX_PAD((len)*__GLX_SIZE_INT8), (char *)answer) + WriteToClient(client, __GLX_PAD((len)*__GLX_SIZE_INT8), answer) #define __GLX_SEND_SHORT_ARRAY(len) \ - WriteToClient(client, __GLX_PAD((len)*__GLX_SIZE_INT16), (char *)answer) + WriteToClient(client, __GLX_PAD((len)*__GLX_SIZE_INT16), answer) #define __GLX_SEND_INT_ARRAY(len) \ - WriteToClient(client, (len)*__GLX_SIZE_INT32, (char *)answer) + WriteToClient(client, (len)*__GLX_SIZE_INT32, answer) #define __GLX_SEND_FLOAT_ARRAY(len) \ - WriteToClient(client, (len)*__GLX_SIZE_FLOAT32, (char *)answer) + WriteToClient(client, (len)*__GLX_SIZE_FLOAT32, answer) #define __GLX_SEND_DOUBLE_ARRAY(len) \ - WriteToClient(client, (len)*__GLX_SIZE_FLOAT64, (char *)answer) + WriteToClient(client, (len)*__GLX_SIZE_FLOAT64, answer) #define __GLX_SEND_VOID_ARRAY(len) __GLX_SEND_BYTE_ARRAY(len) |