diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2020-05-16 08:49:01 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2020-05-16 08:49:01 +0000 |
| commit | 2b99abbf904b991354dd11894f89df4149d78452 (patch) | |
| tree | 7115019219898a5af95ff5eab9dd2de4f64c23ed /lib/libxcb/src | |
| parent | cce403ce8a020b2a263b96cfadd870d153c1d618 (diff) | |
Update to libxcb 1.14 and xcb-proto 1.14. ok tb@
Diffstat (limited to 'lib/libxcb/src')
| -rw-r--r-- | lib/libxcb/src/Makefile | 4 | ||||
| -rw-r--r-- | lib/libxcb/src/screensaver.c | 6 | ||||
| -rw-r--r-- | lib/libxcb/src/screensaver.h | 7 |
3 files changed, 7 insertions, 10 deletions
diff --git a/lib/libxcb/src/Makefile b/lib/libxcb/src/Makefile index 6064ffaa2..33b4fcca0 100644 --- a/lib/libxcb/src/Makefile +++ b/lib/libxcb/src/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2018/10/04 20:17:48 matthieu Exp $ +# $OpenBSD: Makefile,v 1.12 2020/05/16 08:49:00 matthieu Exp $ # This Makefile is used to generate the sources files with xcbgen # The x11/py-xcbgen package needs to be installed @@ -6,7 +6,7 @@ DATADIR= ${X11BASE}/share PYTHON= python${PYTHON_VERSION} -MANOPTIONS= -c 'libxcb 1.13.1' -l 'X Version 11' -s 3 +MANOPTIONS= -c 'libxcb 1.14' -l 'X Version 11' -s 3 SRCS= \ bigreq.c \ diff --git a/lib/libxcb/src/screensaver.c b/lib/libxcb/src/screensaver.c index 67d761705..9d8457616 100644 --- a/lib/libxcb/src/screensaver.c +++ b/lib/libxcb/src/screensaver.c @@ -797,7 +797,7 @@ xcb_screensaver_unset_attributes (xcb_connection_t *c, xcb_void_cookie_t xcb_screensaver_suspend_checked (xcb_connection_t *c, - uint8_t suspend) + uint32_t suspend) { static const xcb_protocol_request_t xcb_req = { .count = 2, @@ -811,7 +811,6 @@ xcb_screensaver_suspend_checked (xcb_connection_t *c, xcb_screensaver_suspend_request_t xcb_out; xcb_out.suspend = suspend; - memset(xcb_out.pad0, 0, 3); xcb_parts[2].iov_base = (char *) &xcb_out; xcb_parts[2].iov_len = sizeof(xcb_out); @@ -824,7 +823,7 @@ xcb_screensaver_suspend_checked (xcb_connection_t *c, xcb_void_cookie_t xcb_screensaver_suspend (xcb_connection_t *c, - uint8_t suspend) + uint32_t suspend) { static const xcb_protocol_request_t xcb_req = { .count = 2, @@ -838,7 +837,6 @@ xcb_screensaver_suspend (xcb_connection_t *c, xcb_screensaver_suspend_request_t xcb_out; xcb_out.suspend = suspend; - memset(xcb_out.pad0, 0, 3); xcb_parts[2].iov_base = (char *) &xcb_out; xcb_parts[2].iov_len = sizeof(xcb_out); diff --git a/lib/libxcb/src/screensaver.h b/lib/libxcb/src/screensaver.h index 1982f21e5..f6982ea00 100644 --- a/lib/libxcb/src/screensaver.h +++ b/lib/libxcb/src/screensaver.h @@ -193,8 +193,7 @@ typedef struct xcb_screensaver_suspend_request_t { uint8_t major_opcode; uint8_t minor_opcode; uint16_t length; - uint8_t suspend; - uint8_t pad0[3]; + uint32_t suspend; } xcb_screensaver_suspend_request_t; /** Opcode for xcb_screensaver_notify. */ @@ -492,7 +491,7 @@ xcb_screensaver_unset_attributes (xcb_connection_t *c, */ xcb_void_cookie_t xcb_screensaver_suspend_checked (xcb_connection_t *c, - uint8_t suspend); + uint32_t suspend); /** * @@ -504,7 +503,7 @@ xcb_screensaver_suspend_checked (xcb_connection_t *c, */ xcb_void_cookie_t xcb_screensaver_suspend (xcb_connection_t *c, - uint8_t suspend); + uint32_t suspend); #ifdef __cplusplus |