From 48d2656fa1dd98e9d88b31211fa4f09f813e7b30 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/XRecord.c | 11 ----------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index c169598..34ae352 100644 --- a/configure.ac +++ b/configure.ac @@ -45,13 +45,7 @@ XORG_WITH_XSLTPROC XORG_CHECK_SGML_DOCTOOLS(1.8) # Obtain compiler/linker options for depedencies -PKG_CHECK_MODULES(XTST, x11 [xext >= 1.0.99.4] xi [recordproto >= 1.13.99.1] [xextproto >= 7.0.99.3] inputproto) - -# Check for _XEatDataWords function that may be patched into older Xlib release -SAVE_LIBS="$LIBS" -LIBS="$XTST_LIBS" -AC_CHECK_FUNCS([_XEatDataWords]) -LIBS="$SAVE_LIBS" +PKG_CHECK_MODULES(XTST, [x11 >= 1.6] [xext >= 1.0.99.4] xi [recordproto >= 1.13.99.1] [xextproto >= 7.0.99.3] inputproto) # Determine if the source for man pages is available # It may already be present (tarball) or can be generated using xmlto diff --git a/src/XRecord.c b/src/XRecord.c index 5bbd5ac..50420c0 100644 --- a/src/XRecord.c +++ b/src/XRecord.c @@ -61,17 +61,6 @@ from The Open Group. #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 _xrecord_info_data; static XExtensionInfo *xrecord_info = &_xrecord_info_data; static const char *xrecord_extension_name = RECORD_NAME; -- cgit v1.2.3