diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-04 09:37:48 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-04 09:37:48 +0100 |
| commit | ed474047e06f28fe740130f3bb13d3a40f4833a9 (patch) | |
| tree | 35a48f61c00ebb1f0579159c25dbbd1bfe812849 /libX11/include/X11/Xlib.h | |
| parent | 3c0e16af61a9e0b6f9edab1d403adfaa85456599 (diff) | |
| parent | d4d629b77742e60caac3d120ff40e9f386380af2 (diff) | |
| download | vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.tar.gz vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.tar.bz2 vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesalib pixman xserver xkeyboard-config git update 4 Mar 2013
Conflicts:
libX11/src/xkb/XKBGAlloc.c
libX11/src/xkb/XKBMisc.c
Diffstat (limited to 'libX11/include/X11/Xlib.h')
| -rw-r--r-- | libX11/include/X11/Xlib.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libX11/include/X11/Xlib.h b/libX11/include/X11/Xlib.h index 112b85a94..f29976354 100644 --- a/libX11/include/X11/Xlib.h +++ b/libX11/include/X11/Xlib.h @@ -128,11 +128,7 @@ typedef int Status; #define BitmapBitOrder(dpy) (((_XPrivDisplay)dpy)->bitmap_bit_order) #define BitmapPad(dpy) (((_XPrivDisplay)dpy)->bitmap_pad) #define ImageByteOrder(dpy) (((_XPrivDisplay)dpy)->byte_order) -#ifdef CRAY /* unable to get WORD64 without pulling in other symbols */ -#define NextRequest(dpy) XNextRequest(dpy) -#else #define NextRequest(dpy) (((_XPrivDisplay)dpy)->request + 1) -#endif #define LastKnownRequestProcessed(dpy) (((_XPrivDisplay)dpy)->last_request_read) /* macros for screen oriented applications (toolkit) */ |