diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-11 11:55:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-11 11:55:48 +0200 |
| commit | 6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab (patch) | |
| tree | 21e1af7ee94600e349ae21353dc11963a06e988d /xorg-server/glx/indirect_util.c | |
| parent | 75f57cf199b6c042b0f7515e3a1ab80f7ccecfab (diff) | |
| parent | d137057fd13e83ec15ab416c7fe774741da06047 (diff) | |
| download | vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.gz vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.bz2 vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/shm.c
xorg-server/Xext/sync.c
xorg-server/Xext/xf86bigfont.c
xorg-server/Xi/opendev.c
xorg-server/dix/dispatch.c
xorg-server/include/globals.h
xorg-server/mi/miinitext.c
Diffstat (limited to 'xorg-server/glx/indirect_util.c')
| -rw-r--r-- | xorg-server/glx/indirect_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/glx/indirect_util.c b/xorg-server/glx/indirect_util.c index 66604617e..74fd349a3 100644 --- a/xorg-server/glx/indirect_util.c +++ b/xorg-server/glx/indirect_util.c @@ -142,10 +142,10 @@ __glXSendReply(ClientPtr client, const void *data, size_t elements, */ (void) memcpy(&__glXReply.pad3, data, 8); - WriteToClient(client, sz_xGLXSingleReply, (char *) &__glXReply); + WriteToClient(client, sz_xGLXSingleReply, &__glXReply); if (reply_ints != 0) { - WriteToClient(client, reply_ints * 4, (char *) data); + WriteToClient(client, reply_ints * 4, data); } } @@ -188,10 +188,10 @@ __glXSendReplySwap(ClientPtr client, const void *data, size_t elements, */ (void) memcpy(&__glXReply.pad3, data, 8); - WriteToClient(client, sz_xGLXSingleReply, (char *) &__glXReply); + WriteToClient(client, sz_xGLXSingleReply, &__glXReply); if (reply_ints != 0) { - WriteToClient(client, reply_ints * 4, (char *) data); + WriteToClient(client, reply_ints * 4, data); } } |