Commit bd2650ca authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Port _XEatDataWords

This required for successful linking of libXrender against libNX_X11. Port from libXfixes commit b031e3b60fa1af9e49449f23d4a84395868be3ab We need this here to enable linking of current libXrender against libNX_X11 instead of the system's libX11 The original implementation of this function (libX11 commit 9f5d83706543696fc944c1835a403938c06f2cc5) uses xcb stuff which we do not have in libNX_X11. So we take a workaround from another lib. This workaround had been added temporarily to a couple of X extension libs, see e.g. https://lists.x.org/archives/xorg-devel/2013-July/036763.html.
parent 36d0fac7
...@@ -2751,6 +2751,30 @@ void _XEatData( ...@@ -2751,6 +2751,30 @@ void _XEatData(
#undef SCRATCHSIZE #undef SCRATCHSIZE
} }
/*
Port from libXfixes commit
b031e3b60fa1af9e49449f23d4a84395868be3ab We need this here to
enable linking of current libXrender against libNX_X11 instead of
the system's libX11
The original implementation of this function (libX11 commit
9f5d83706543696fc944c1835a403938c06f2cc5) uses xcb stuff which we
do not have in libNX_X11. So we take a workaround from another
lib. This workaround had been implemented temporarily in a couple
of X libs, see e.g. https://lists.x.org/archives/xorg-devel/2013-July/036763.html.
*/
#include <X11/Xmd.h> /* for LONG64 on 64-bit platforms */
#include <limits.h>
void _XEatDataWords(Display *dpy, unsigned long n)
{
#ifndef LONG64
if (n >= (ULONG_MAX >> 2))
_XIOError(dpy);
#endif
_XEatData (dpy, n << 2);
}
/* /*
* _XEnq - Place event packets on the display's queue. * _XEnq - Place event packets on the display's queue.
......
...@@ -879,6 +879,10 @@ extern void _XEatData( ...@@ -879,6 +879,10 @@ extern void _XEatData(
Display* /* dpy */, Display* /* dpy */,
unsigned long /* n */ unsigned long /* n */
); );
extern void _XEatDataWords(
Display* /* dpy */,
unsigned long /* n */
);
extern char *_XAllocScratch( extern char *_XAllocScratch(
Display* /* dpy */, Display* /* dpy */,
unsigned long /* nbytes */ unsigned long /* nbytes */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment