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:19:31 -0800 |
| commit | 7fad129032e7b4be67a27e31c660ca10b44444f6 (patch) | |
| tree | 7dc29482007e5b7138d27b21ddb607ba614c4eac | |
| parent | 0f2e21d7e8310cf7bc02bba56884be0e52c061ae (diff) | |
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/XF86DGA2.c | 11 |
2 files changed, 1 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 3127c6e..005d1bc 100644 --- a/configure.ac +++ b/configure.ac @@ -20,13 +20,7 @@ XORG_DEFAULT_OPTIONS XORG_CHECK_MALLOC_ZERO # Obtain compiler/linker options for depedencies -PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >= 2.0.99.2]) - -# Check for _XEatDataWords function that may be patched into older Xlib release -SAVE_LIBS="$LIBS" -LIBS="$XXF86DGA_LIBS" -AC_CHECK_FUNCS([_XEatDataWords]) -LIBS="$SAVE_LIBS" +PKG_CHECK_MODULES(XXF86DGA, xproto [x11 >= 1.6] xextproto xext [xf86dgaproto >= 2.0.99.2]) AC_CONFIG_FILES([Makefile src/Makefile diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c index 9c656e6..ebc97ce 100644 --- a/src/XF86DGA2.c +++ b/src/XF86DGA2.c @@ -27,17 +27,6 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc #include <stdint.h> #include <limits.h> -#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 - /* If you change this, change the Bases[] array below as well */ #define MAX_HEADS 16 |