diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-05 15:54:44 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-09-05 15:54:44 +0000 |
| commit | 1f6f82c0a5a3164b783bd897c90f993af8881801 (patch) | |
| tree | 5aac76214380b0727a7d6840c79f1ea4bd8554d3 /dist/libxcb/src | |
| parent | 8c9a1ece25075cdb75a377e379c16687da038f00 (diff) | |
Update to libxcb 1.4. tested by naddy@ on a packages bulk build.
Diffstat (limited to 'dist/libxcb/src')
| -rw-r--r-- | dist/libxcb/src/Makefile.am | 2 | ||||
| -rw-r--r-- | dist/libxcb/src/xcb.h | 6 | ||||
| -rw-r--r-- | dist/libxcb/src/xcb_out.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/dist/libxcb/src/Makefile.am b/dist/libxcb/src/Makefile.am index e13092a46..5de3b09f3 100644 --- a/dist/libxcb/src/Makefile.am +++ b/dist/libxcb/src/Makefile.am @@ -75,7 +75,7 @@ EXTSOURCES += randr.c EXTENSION_XML += randr.xml if BUILD_RANDR lib_LTLIBRARIES += libxcb-randr.la -libxcb_randr_la_LDFLAGS = -version-info 1:0:0 +libxcb_randr_la_LDFLAGS = -version-info 1:0:1 libxcb_randr_la_LIBADD = $(XCB_LIBS) nodist_libxcb_randr_la_SOURCES = randr.c randr.h endif diff --git a/dist/libxcb/src/xcb.h b/dist/libxcb/src/xcb.h index d24ef9576..f95127665 100644 --- a/dist/libxcb/src/xcb.h +++ b/dist/libxcb/src/xcb.h @@ -141,7 +141,11 @@ typedef struct { uint8_t response_type; /**< Type of the response */ uint8_t error_code; /**< Error code */ uint16_t sequence; /**< Sequence number */ - uint32_t pad[7]; /**< Padding */ + uint32_t resource_id; /** < Resource ID for requests with side effects only */ + uint16_t minor_code; /** < Minor opcode of the failed request */ + uint8_t major_code; /** < Major opcode of the failed request */ + uint8_t pad0; + uint32_t pad[5]; /**< Padding */ uint32_t full_sequence; /**< full sequence */ } xcb_generic_error_t; diff --git a/dist/libxcb/src/xcb_out.c b/dist/libxcb/src/xcb_out.c index 4c6ab133b..b3050fe3d 100644 --- a/dist/libxcb/src/xcb_out.c +++ b/dist/libxcb/src/xcb_out.c @@ -242,7 +242,7 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect vector[1].iov_base = (uint32_t *) vector[1].iov_base + 1; vector[1].iov_len -= sizeof(uint32_t); } - vector[0].iov_len = sizeof(uint32_t) * (prefix[0] ? 1 : 0 | prefix[2] ? 2 : 0); + vector[0].iov_len = sizeof(uint32_t) * ((prefix[0] ? 1 : 0) + (prefix[2] ? 2 : 0)); vector[0].iov_base = prefix + !prefix[0]; } |