From 73db05c85f7a8cf2439f7c333ede6ff2dc4877d7 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 19 Nov 2013 07:52:09 +0100 Subject: libxcb xcb-proto xserver mesa git update 19 nov 2013 xserver commit da9997f89f14ab619f244d5b2e80a423b028c789 libxcb commit 5d1dbb468bb0f834eaa8adea6daf6729808ca429 libxcb/xcb-proto commit 281790373e625cc1e9f67b39fe0d687f279edbfb mesa commit 21ae5135dd30bbd2ec7d2b44e07b6cb1d6425d9e --- libxcb/src/xcb_in.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libxcb/src/xcb_in.c') diff --git a/libxcb/src/xcb_in.c b/libxcb/src/xcb_in.c index 8c3a58cc3..fd6c2efd2 100644 --- a/libxcb/src/xcb_in.c +++ b/libxcb/src/xcb_in.c @@ -888,13 +888,16 @@ int _xcb_in_read(xcb_connection_t *c) .iov_base = c->in.queue + c->in.queue_len, .iov_len = sizeof(c->in.queue) - c->in.queue_len, }; - 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 = &iov, .msg_iovlen = 1, - .msg_control = cmsgbuf, + .msg_control = cmsgbuf.buf, .msg_controllen = CMSG_SPACE(sizeof(int) * (XCB_MAX_PASS_FD - c->in.in_fd.nfd)), }; n = recvmsg(c->fd, &msg, 0); -- cgit v1.2.3