diff options
| author | Michael Joost <mehl@michael-joost.de> | 2013-11-18 16:11:26 +0100 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-11-22 23:15:35 -0800 |
| commit | bc00b4fb0b52ed2f6f8544fa3b5da9693ee7ed90 (patch) | |
| tree | bb0bef99c1fd715cac8c486971eb7b4e6a759e71 | |
| parent | 30a7b506ae2071b8d265ce4eaeed1af60bc7ee7b (diff) | |
| download | xorg-lib-libXrandr-bc00b4fb0b52ed2f6f8544fa3b5da9693ee7ed90.tar.gz | |
Remove fallback for _XEatDataWords, require libX11 1.6 for it
_XEatDataWords was orignally introduced with the May 2013 security
patches, and in order to ease the process of delivering those,
fallback versions of _XEatDataWords were included in the X extension
library patches so they could be applied to older versions that didn't
have libX11 1.6 yet. Now that we're past that hurdle, we can drop
the fallbacks and just require libX11 1.6 for building new versions
of the extension libraries.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/Xrandrint.h | 14 |
2 files changed, 1 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index a4cfbcd..15b1e8c 100644 --- a/configure.ac +++ b/configure.ac @@ -53,13 +53,7 @@ RANDR_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] AC_SUBST(RANDR_VERSION) # Obtain compiler/linker options for depedencies -PKG_CHECK_MODULES(RANDR, x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto) - -# Check for _XEatDataWords function that may be patched into older Xlib release -SAVE_LIBS="$LIBS" -LIBS="$RANDR_LIBS" -AC_CHECK_FUNCS([_XEatDataWords]) -LIBS="$SAVE_LIBS" +PKG_CHECK_MODULES(RANDR, [x11 >= 1.6] randrproto >= $RANDR_VERSION xext xextproto xrender renderproto) AC_CONFIG_FILES([Makefile src/Makefile diff --git a/src/Xrandrint.h b/src/Xrandrint.h index 1687c29..75facac 100644 --- a/src/Xrandrint.h +++ b/src/Xrandrint.h @@ -42,20 +42,6 @@ extern char XRRExtensionName[]; XExtDisplayInfo *XRRFindDisplay (Display *dpy); -#ifndef HAVE__XEATDATAWORDS -#include <X11/Xmd.h> /* for LONG64 on 64-bit platforms */ -#include <limits.h> - -static inline void _XEatDataWords(Display *dpy, unsigned long n) -{ -# ifndef LONG64 - if (n >= (ULONG_MAX >> 2)) - _XIOError(dpy); -# endif - _XEatData (dpy, n << 2); -} -#endif - /* deliberately opaque internal data structure; can be extended, but not reordered */ struct _XRRScreenConfiguration { |