From c8483dc2831dc37d93a36804022f6b064f5962ea Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 8 Nov 2013 11:47:30 +0100 Subject: Solved compilation and link problems after last merge --- include/xcb/xcb.h | 17 ----------------- include/xcb/xproto.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-) (limited to 'include/xcb') diff --git a/include/xcb/xcb.h b/include/xcb/xcb.h index dda28bcdc..f4ba1de13 100644 --- a/include/xcb/xcb.h +++ b/include/xcb/xcb.h @@ -138,23 +138,6 @@ typedef struct { uint32_t full_sequence; /**< full sequence */ } xcb_generic_event_t; -/** - * @brief GE event - * - * An event as sent by the XGE extension. The length field specifies the - * number of 4-byte blocks trailing the struct. - */ -typedef struct { - uint8_t response_type; /**< Type of the response */ - uint8_t pad0; /**< Padding */ - uint16_t sequence; /**< Sequence number */ - uint32_t length; - uint16_t event_type; - uint16_t pad1; - uint32_t pad[5]; /**< Padding */ - uint32_t full_sequence; /**< full sequence */ -} xcb_ge_event_t; - /** * @brief Generic error. * diff --git a/include/xcb/xproto.h b/include/xcb/xproto.h index ff5745b53..20d20c476 100644 --- a/include/xcb/xproto.h +++ b/include/xcb/xproto.h @@ -1200,6 +1200,22 @@ typedef struct xcb_mapping_notify_event_t { uint8_t pad1; /**< */ } xcb_mapping_notify_event_t; +/** Opcode for xcb_ge. */ +#define XCB_GE 35 + +/** + * @brief xcb_ge_event_t + **/ +typedef struct xcb_ge_event_t { + uint8_t response_type; /**< */ + uint8_t extension; /**< */ + uint16_t sequence; /**< */ + uint32_t length; /**< */ + uint16_t event_type; /**< */ + uint8_t pad0[22]; /**< */ + uint32_t full_sequence; /**< */ +} xcb_ge_event_t; + /** Opcode for xcb_request. */ #define XCB_REQUEST 1 -- cgit v1.2.3