Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/dix/grabs.c

2 files changed, 50 insertions, 49 deletions

diff --git a/libX11/src/UIThrStubs.c b/libX11/src/UIThrStubs.c
index a3bcdfc41..95873e88f 100644
--- a/libX11/src/UIThrStubs.c
+++ b/libX11/src/UIThrStubs.c
@@ -81,9 +81,7 @@ typedef thread_t xthread_t;
 #pragma weak cond_broadcast = _Xthr_zero_stub_
 #else /* !SVR4 */
 #ifdef WIN32
-    /*
-     * Don't know what to do here. Is there something do be done at all?
-     */
+#include <X11/Xthreads.h>
 #else /* !WIN32 */
 #ifdef USE_TIS_SUPPORT
 #include <tis.h>
diff --git a/libX11/src/Xxcbint.h b/libX11/src/Xxcbint.h
index 15423c407..a8c9a670b 100644
--- a/libX11/src/Xxcbint.h
+++ b/libX11/src/Xxcbint.h
@@ -1,46 +1,49 @@
-/* Copyright (C) 2003-2006 Jamey Sharp, Josh Triplett

- * This file is licensed under the MIT license. See the file COPYING. */

-

-#ifndef XXCBINT_H

-#define XXCBINT_H

-

-#include <assert.h>

-#include <stdint.h>

-#include <X11/Xlibint.h>

-#include <X11/Xlib-xcb.h>

-#include "locking.h"

-

-#define XLIB_SEQUENCE_COMPARE(a,op,b)	(((long) (a) - (long) (b)) op 0)

-

-typedef struct PendingRequest PendingRequest;

-struct PendingRequest {

-	PendingRequest *next;

-	unsigned long sequence;

-	unsigned reply_waiter;

-};

-

-typedef struct _X11XCBPrivate {

-	xcb_connection_t *connection;

-	PendingRequest *pending_requests;

-	PendingRequest *pending_requests_tail;

-	xcb_generic_event_t *next_event;

-	char *real_bufmax;

-	char *reply_data;

-	int reply_length;

-	int reply_consumed;

-	uint64_t last_flushed;

-	enum XEventQueueOwner event_owner;

-	XID next_xid;

-

-	/* handle simultaneous threads waiting for responses */

-	xcondition_t event_notify;

-	int event_waiter;

-	xcondition_t reply_notify;

-} _X11XCBPrivate;

-

-/* xcb_disp.c */

-

-int _XConnectXCB(Display *dpy, _Xconst char *display, int *screenp);

-void _XFreeX11XCBStructure(Display *dpy);

-

-#endif /* XXCBINT_H */

+/* Copyright (C) 2003-2006 Jamey Sharp, Josh Triplett
+ * This file is licensed under the MIT license. See the file COPYING. */
+
+#ifndef XXCBINT_H
+#define XXCBINT_H
+
+#include <assert.h>
+#include <stdint.h>
+#include <X11/Xlibint.h>
+#ifdef WIN32
+#include <X11/Xwindows.h>
+#endif
+#include <X11/Xlib-xcb.h>
+#include "locking.h"
+
+#define XLIB_SEQUENCE_COMPARE(a,op,b)	(((long) (a) - (long) (b)) op 0)
+
+typedef struct PendingRequest PendingRequest;
+struct PendingRequest {
+	PendingRequest *next;
+	unsigned long sequence;
+	unsigned reply_waiter;
+};
+
+typedef struct _X11XCBPrivate {
+	xcb_connection_t *connection;
+	PendingRequest *pending_requests;
+	PendingRequest *pending_requests_tail;
+	xcb_generic_event_t *next_event;
+	char *real_bufmax;
+	char *reply_data;
+	int reply_length;
+	int reply_consumed;
+	uint64_t last_flushed;
+	enum XEventQueueOwner event_owner;
+	XID next_xid;
+
+	/* handle simultaneous threads waiting for responses */
+	xcondition_t event_notify;
+	int event_waiter;
+	xcondition_t reply_notify;
+} _X11XCBPrivate;
+
+/* xcb_disp.c */
+
+int _XConnectXCB(Display *dpy, _Xconst char *display, int *screenp);
+void _XFreeX11XCBStructure(Display *dpy);
+
+#endif /* XXCBINT_H */