[PATCH:libXi] Remove fallback for _XEatDataWords, require libX11 1.6 for it

[Peter Hutterer]

On Sat, Nov 23, 2013 at 09:51:57AM -0800, Alan Coopersmith wrote:
> From: Michael Joost <mehl at michael-joost.de>
> 
> _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 at oracle.com>
> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

thank you, pushed as c4b261d..288f336  master -> master

Cheers,
   Peter

> ---
>  configure.ac |    8 +-------
>  src/XIint.h  |   13 -------------
>  2 files changed, 1 insertion(+), 20 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index a66fcee..54ec255 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -27,16 +27,10 @@ XORG_WITH_ASCIIDOC(8.4.5)
>  XORG_CHECK_MALLOC_ZERO
>  
>  # Obtain compiler/linker options for dependencies
> -PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 2.2.99.1])
> +PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.6] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 2.2.99.1])
>  # CFLAGS only for PointerBarrier typedef
>  PKG_CHECK_MODULES(XFIXES, [xfixes >= 5])
>  
> -# Check for _XEatDataWords function that may be patched into older Xlib releases
> -SAVE_LIBS="$LIBS"
> -LIBS="$XI_LIBS"
> -AC_CHECK_FUNCS([_XEatDataWords])
> -LIBS="$SAVE_LIBS"
> -
>  # Check for xmlto and asciidoc for man page conversion
>  # (only needed by people building tarballs)
>  if test "$have_xmlto" = yes && test "$have_asciidoc" = yes; then
> diff --git a/src/XIint.h b/src/XIint.h
> index 3ddc3c5..99f3652 100644
> --- a/src/XIint.h
> +++ b/src/XIint.h
> @@ -83,18 +83,5 @@ next_block(void **ptr, int size) {
>      return ret;
>  }
>  
> -#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
>  
>  #endif
> -- 
> 1.7.9.2
>