From 63bfcd0be46413dda8c22b914d12f66ea5d5c66d Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 May 2014 19:36:09 +0200 Subject: libX11 mesa xserver pixman git update 23 May 2014 xserver commit db2e708f31a162c6c66643d3559dd5f3e21ee06b libX11 commit e3dc0d17339e61eaf0b51b8907510984e3bf23cb pixman commit 9cd283b2eb8279824406bfd47b020d21fc00cf82 mesa commit 404387ecd72a4a9ace8c1fa6895823aabfd759ad --- libX11/src/Macros.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'libX11/src/Macros.c') 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) -- cgit v1.2.3