Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mapi/glapi/gen/gl_gentable.py
	xorg-server/include/servermd.h

3 files changed, 26 insertions, 1 deletions

diff --git a/libX11/src/Macros.c b/libX11/src/Macros.c
index cfc083a01..394a7641f 100644
--- a/libX11/src/Macros.c
+++ b/libX11/src/Macros.c
@@ -30,6 +30,7 @@ in this Software without prior written authorization from The Open Group.
 #include "Xlibint.h"
 #define XUTIL_DEFINE_FUNCTIONS
 #include "Xutil.h"
+#include "Xxcbint.h"
 
 /*
  * This file makes full definitions of routines for each macro.
@@ -135,9 +136,20 @@ int XBitmapPad(Display *dpy) { return (BitmapPad(dpy)); }
 
 int XImageByteOrder(Display *dpy) { return (ImageByteOrder(dpy)); }
 
+/* XNextRequest() differs from the rest of the functions here because it is
+ * no longer a macro wrapper - when libX11 is being used mixed together
+ * with direct use of xcb, the next request field of the Display structure will
+ * not be updated. We can't fix the NextRequest() macro in any easy way,
+ * but we can at least make XNextRequest() do the right thing.
+ */
 unsigned long XNextRequest(Display *dpy)
 {
-    return (NextRequest(dpy));
+    unsigned long next_request;
+    LockDisplay(dpy);
+    next_request = _XNextRequest(dpy);
+    UnlockDisplay(dpy);
+
+    return next_request;
 }
 
 unsigned long XLastKnownRequestProcessed(Display *dpy)
diff --git a/libX11/src/Xxcbint.h b/libX11/src/Xxcbint.h
index a8c9a670b..bf41c23ff 100644
--- a/libX11/src/Xxcbint.h
+++ b/libX11/src/Xxcbint.h
@@ -46,4 +46,6 @@ typedef struct _X11XCBPrivate {
 int _XConnectXCB(Display *dpy, _Xconst char *display, int *screenp);
 void _XFreeX11XCBStructure(Display *dpy);
 
+unsigned long _XNextRequest(Display *dpy);
+
 #endif /* XXCBINT_H */
diff --git a/libX11/src/xcb_io.c b/libX11/src/xcb_io.c
index db75e4a24..f65ef3a24 100644
--- a/libX11/src/xcb_io.c
+++ b/libX11/src/xcb_io.c
@@ -777,3 +777,14 @@ void _XEatDataWords(Display *dpy, unsigned long n)
 		dpy->xcb->reply_consumed = dpy->xcb->reply_length;
 	_XFreeReplyData(dpy, False);
 }
+
+unsigned long
+_XNextRequest(Display *dpy)
+{
+    /* This will update dpy->request. The assumption is that the next thing
+     * that the application will do is make a request so there's little
+     * overhead.
+     */
+    require_socket(dpy);
+    return NextRequest(dpy);
+}