diff options
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/XIint.h | 13 |
2 files changed, 1 insertions, 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 |