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:15:14 -0800 |
| commit | edd95182b26eb5d576d4878c559e0f17dddaa909 (patch) | |
| tree | 552b594a7052a446cdf339e7a0d6efb814083982 | |
| parent | 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff (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/Xinerama.c | 14 |
2 files changed, 1 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index 17c5cb1..e2b60db 100644 --- a/configure.ac +++ b/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/src/Xinerama.c b/src/Xinerama.c index 67a35b5..8472ec5 100644 --- a/src/Xinerama.c +++ b/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; |