diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-19 07:52:09 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-19 07:52:09 +0100 |
| commit | 73db05c85f7a8cf2439f7c333ede6ff2dc4877d7 (patch) | |
| tree | 99d99330efd4e8270d3c40a58a3b1576d9780f75 /libxcb/src/xcb_conn.c | |
| parent | 7c20de6c7fb53ed404d4df0d975328318810ce01 (diff) | |
| download | vcxsrv-73db05c85f7a8cf2439f7c333ede6ff2dc4877d7.tar.gz vcxsrv-73db05c85f7a8cf2439f7c333ede6ff2dc4877d7.tar.bz2 vcxsrv-73db05c85f7a8cf2439f7c333ede6ff2dc4877d7.zip | |
libxcb xcb-proto xserver mesa git update 19 nov 2013
xserver commit da9997f89f14ab619f244d5b2e80a423b028c789
libxcb commit 5d1dbb468bb0f834eaa8adea6daf6729808ca429
libxcb/xcb-proto commit 281790373e625cc1e9f67b39fe0d687f279edbfb
mesa commit 21ae5135dd30bbd2ec7d2b44e07b6cb1d6425d9e
Diffstat (limited to 'libxcb/src/xcb_conn.c')
| -rw-r--r-- | libxcb/src/xcb_conn.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libxcb/src/xcb_conn.c b/libxcb/src/xcb_conn.c index 50e7fb604..46390e1da 100644 --- a/libxcb/src/xcb_conn.c +++ b/libxcb/src/xcb_conn.c @@ -216,13 +216,16 @@ static int write_vec(xcb_connection_t *c, struct iovec **vector, int *count) #if HAVE_SENDMSG if (c->out.out_fd.nfd) { - char cmsgbuf[CMSG_SPACE(sizeof(int) * XCB_MAX_PASS_FD)]; + union { + struct cmsghdr cmsghdr; + char buf[CMSG_SPACE(XCB_MAX_PASS_FD * sizeof(int))]; + } cmsgbuf; struct msghdr msg = { .msg_name = NULL, .msg_namelen = 0, .msg_iov = *vector, .msg_iovlen = n, - .msg_control = cmsgbuf, + .msg_control = cmsgbuf.buf, .msg_controllen = CMSG_LEN(c->out.out_fd.nfd * sizeof (int)), }; int i; |