From ae0ddaa9c960aee1b7845da01270b00177f95f3d Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 22 Nov 2013 23:22:36 -0800 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. Signed-off-by: Alan Coopersmith --- configure.ac | 8 +------- src/XRes.c | 11 ----------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index f68b689..b082de8 100644 --- a/configure.ac +++ b/configure.ac @@ -48,13 +48,7 @@ XORG_DEFAULT_OPTIONS XORG_CHECK_MALLOC_ZERO # Obtain compiler/linker options for depedencies -PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= 1.2.0]) - -# Check for _XEatDataWords function that may be patched into older Xlib release -SAVE_LIBS="$LIBS" -LIBS="$XRES_LIBS" -AC_CHECK_FUNCS([_XEatDataWords]) -LIBS="$SAVE_LIBS" +PKG_CHECK_MODULES(XRES, [x11 >= 1.6] xext xextproto [resourceproto >= 1.2.0]) AC_CONFIG_FILES([Makefile src/Makefile diff --git a/src/XRes.c b/src/XRes.c index 89fab82..2bee277 100644 --- a/src/XRes.c +++ b/src/XRes.c @@ -15,17 +15,6 @@ #include #include -#ifndef HAVE__XEATDATAWORDS -static inline void _XEatDataWords(Display *dpy, unsigned long n) -{ -# ifndef LONG64 - if (n >= (ULONG_MAX >> 2)) - _XIOError(dpy); -# endif - _XEatData (dpy, n << 2); -} -#endif - static XExtensionInfo _xres_ext_info_data; static XExtensionInfo *xres_ext_info = &_xres_ext_info_data; static const char *xres_extension_name = XRES_NAME; -- cgit v1.2.1