aboutsummaryrefslogtreecommitdiff
path: root/libxcb/src/xcb_conn.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-19 13:31:55 +0000
committermarha <marha@users.sourceforge.net>2010-04-19 13:31:55 +0000
commit0b44ee3fb92120190fa46e73b7abfbaa8a0adaec (patch)
tree19cbbfc194d8d543a7826cdb5cd6af966d15c619 /libxcb/src/xcb_conn.c
parent0b53765917ae196147886189ca3514a07e0eb45e (diff)
downloadvcxsrv-0b44ee3fb92120190fa46e73b7abfbaa8a0adaec.tar.gz
vcxsrv-0b44ee3fb92120190fa46e73b7abfbaa8a0adaec.tar.bz2
vcxsrv-0b44ee3fb92120190fa46e73b7abfbaa8a0adaec.zip
svn merge -r539:HEAD "^/branches/released" .
Diffstat (limited to 'libxcb/src/xcb_conn.c')
-rw-r--r--libxcb/src/xcb_conn.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/libxcb/src/xcb_conn.c b/libxcb/src/xcb_conn.c
index cdb71e4e1..ffd9519fb 100644
--- a/libxcb/src/xcb_conn.c
+++ b/libxcb/src/xcb_conn.c
@@ -134,7 +134,7 @@ static int write_setup(xcb_connection_t *c, xcb_auth_info_t *auth_info)
out.authorization_protocol_name_len = 0;
out.authorization_protocol_data_len = 0;
parts[count].iov_len = sizeof(xcb_setup_request_t);
- parts[count++].iov_base = &out;
+ parts[count++].iov_base = (caddr_t) &out;
parts[count].iov_len = XCB_PAD(sizeof(xcb_setup_request_t));
parts[count++].iov_base = (char *) pad;
@@ -152,10 +152,7 @@ static int write_setup(xcb_connection_t *c, xcb_auth_info_t *auth_info)
assert(count <= (int) (sizeof(parts) / sizeof(*parts)));
pthread_mutex_lock(&c->iolock);
- {
- struct iovec *parts_ptr = parts;
- ret = _xcb_out_send(c, &parts_ptr, &count);
- }
+ ret = _xcb_out_send(c, parts, count);
pthread_mutex_unlock(&c->iolock);
return ret;
}