aboutsummaryrefslogtreecommitdiff
path: root/libXinerama
diff options
context:
space:
mode:
Diffstat (limited to 'libXinerama')
-rw-r--r--libXinerama/configure.ac8
-rw-r--r--libXinerama/src/Xinerama.c14
2 files changed, 1 insertions, 21 deletions
diff --git a/libXinerama/configure.ac b/libXinerama/configure.ac
index 17c5cb1fd..e2b60dbc8 100644
--- a/libXinerama/configure.ac
+++ b/libXinerama/configure.ac
@@ -40,13 +40,7 @@ XORG_DEFAULT_OPTIONS
XORG_CHECK_MALLOC_ZERO
# Obtain compiler/linker options for depedencies
-PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto [xineramaproto >= 1.1.99.1])
-
-# Check for _XEatDataWords function that may be patched into older Xlib releases
-SAVE_LIBS="$LIBS"
-LIBS="$XINERAMA_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
+PKG_CHECK_MODULES(XINERAMA, [x11 >= 1.6] xext xextproto [xineramaproto >= 1.1.99.1])
# Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
diff --git a/libXinerama/src/Xinerama.c b/libXinerama/src/Xinerama.c
index 67a35b578..8472ec5d0 100644
--- a/libXinerama/src/Xinerama.c
+++ b/libXinerama/src/Xinerama.c
@@ -35,20 +35,6 @@ Equipment Corporation.
#include <X11/extensions/panoramiXproto.h>
#include <X11/extensions/Xinerama.h>
-#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
-
static XExtensionInfo _panoramiX_ext_info_data;
static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data;
static const char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;