Solved compilation and link problems after last merge

4 files changed, 37 insertions, 21 deletions

diff --git a/include/dix-config.h b/include/dix-config.h
index a05707d38..726dfaba9 100644..100755
--- a/include/dix-config.h
+++ b/include/dix-config.h
@@ -46,6 +46,9 @@
 /* Build DPMS extension */
 #define DPMSExtension 1
 
+/* Build DRI3 extension */
+/* #undef DRI3 */
+
 /* Build GLX extension */
 #define GLXEXT
 
@@ -71,6 +74,9 @@
 /* Has backtrace support */
 #undef HAVE_BACKTRACE
 
+/* Has libunwind support */
+/* #undef HAVE_LIBUNWIND */
+
 /* Define to 1 if you have the <byteswap.h> header file. */
 #define HAVE_BYTESWAP_H 1
 
@@ -266,6 +272,9 @@
 /* Internal define for Xinerama */
 #define PANORAMIX 1
 
+/* Support Present extension */
+#define PRESENT 1
+
 /* Overall prefix */
 #define PROJECTROOT "."
 
@@ -479,6 +488,9 @@
 #include "dix-config-apple-verbatim.h"
 #endif
 
+/* Have support for X shared memory fence library (xshmfence) */
+/* #undef HAVE_XSHMFENCE */
+
 #undef HAVE_AVC_NETLINK_ACQUIRE_FD
 
 #include <X11/Xwinsock.h>
diff --git a/include/kdrive-config.h b/include/kdrive-config.h
index fdfd80f73..24178c696 100644..100755
--- a/include/kdrive-config.h
+++ b/include/kdrive-config.h
@@ -1,4 +1,3 @@
-/* include/kdrive-config.h.  Generated from kdrive-config.h.in by configure.  */
 /* kdrive-config.h.in: not at all generated.                      -*- c -*-
  */
 
@@ -14,15 +13,21 @@
 /* Include framebuffer support in X servers */
 /* #undef KDRIVEFBDEV */
 
-/* Include vesa support in X servers */
-/* #undef KDRIVEVESA */
-
 /* Enable touchscreen support */
 /* #undef TOUCHSCREEN */
 
 /* Support tslib touchscreen abstraction library */
 /* #undef TSLIB */
 
+/* Support KDrive kbd driver */
+/* #undef KDRIVE_KBD */
+
+/* Support KDrive mouse driver */
+/* #undef KDRIVE_MOUSE */
+
+/* Support KDrive evdev driver */
+/* #undef KDRIVE_EVDEV */
+
 /* Verbose debugging output hilarity */
 /* #undef DEBUG */
 
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
@@ -139,23 +139,6 @@ typedef struct {
 } 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.
  *
  * A generic error structure.
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