diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-23 19:43:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-23 19:43:56 +0200 |
| commit | 1c96f09adce1625dcbae5fe303d7c551a6c1bad3 (patch) | |
| tree | 70b5bbde90432287ae91513b8a4edcc55fcf9e9e /libX11/src/Macros.c | |
| parent | 697c9a1917acd36a1b99e0d263baf2514446ca11 (diff) | |
| parent | 63bfcd0be46413dda8c22b914d12f66ea5d5c66d (diff) | |
| download | vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.tar.gz vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.tar.bz2 vcxsrv-1c96f09adce1625dcbae5fe303d7c551a6c1bad3.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/gen/gl_gentable.py
xorg-server/include/servermd.h
Diffstat (limited to 'libX11/src/Macros.c')
| -rw-r--r-- | libX11/src/Macros.c | 14 |
1 files changed, 13 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) |