From 2222b0fbff96b9f0324bb1e2f56416c84be23c3b Mon Sep 17 00:00:00 2001 From: Michael Joost Date: Mon, 18 Nov 2013 16:11:26 +0100 Subject: 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 Signed-off-by: Alan Coopersmith --- configure.ac | 8 +------- src/Xrenderint.h | 14 -------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index 4e6b271..b5726f0 100644 --- a/configure.ac +++ b/configure.ac @@ -56,13 +56,7 @@ RENDER_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] AC_SUBST(RENDER_VERSION) # Obtain compiler/linker options for depedencies -PKG_CHECK_MODULES(RENDER, x11 renderproto >= $RENDER_VERSION) - -# Check for _XEatDataWords function that may be patched into older Xlib release -SAVE_LIBS="$LIBS" -LIBS="$RENDER_LIBS" -AC_CHECK_FUNCS([_XEatDataWords]) -LIBS="$SAVE_LIBS" +PKG_CHECK_MODULES(RENDER, [x11 >= 1.6] renderproto >= $RENDER_VERSION) AC_CONFIG_FILES([Makefile src/Makefile diff --git a/src/Xrenderint.h b/src/Xrenderint.h index daaa6fe..57b13da 100644 --- a/src/Xrenderint.h +++ b/src/Xrenderint.h @@ -109,18 +109,4 @@ XRenderFindDisplay (Display *dpy); #define DataInt32(dpy,d,len) Data(dpy,(char *) (d),len) #endif -#ifndef HAVE__XEATDATAWORDS -#include /* for LONG64 on 64-bit platforms */ -#include - -static inline void _XEatDataWords(Display *dpy, unsigned long n) -{ -# ifndef LONG64 - if (n >= (ULONG_MAX >> 2)) - _XIOError(dpy); -# endif - _XEatData (dpy, n << 2); -} -#endif - #endif /* _XRENDERINT_H_ */ -- cgit v1.2.3