diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-11-22 23:25:50 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-11-22 23:25:59 -0800 |
| commit | 2b57a94231238576ae5167ca1a4c0b35b0df172f (patch) | |
| tree | 8eb540a3315ff78960cc5daa0f1b3d1e3f3c9a58 | |
| parent | fac4696b912898a0e171fcb93c055bd7fb99161a (diff) | |
| download | xorg-lib-libXp-2b57a94231238576ae5167ca1a4c0b35b0df172f.tar.gz | |
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.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/XpExtUtil.h | 14 |
2 files changed, 1 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index c721461..7779030 100644 --- a/configure.ac +++ b/configure.ac @@ -43,13 +43,7 @@ XORG_DEFAULT_OPTIONS AC_PROG_LIBTOOL # Check for X and print proto -PKG_CHECK_MODULES(XPRINT, x11 xext xextproto xau printproto) - -# Check for _XEatDataWords function that may be patched into older Xlib release -SAVE_LIBS="$LIBS" -LIBS="$XPRINT_LIBS" -AC_CHECK_FUNCS([_XEatDataWords]) -LIBS="$SAVE_LIBS" +PKG_CHECK_MODULES(XPRINT, [x11 >= 1.6] xext xextproto xau printproto) AC_CONFIG_FILES([Makefile src/Makefile diff --git a/src/XpExtUtil.h b/src/XpExtUtil.h index 1889825..d479a95 100644 --- a/src/XpExtUtil.h +++ b/src/XpExtUtil.h @@ -48,20 +48,6 @@ extern char *_xpstrdup( const char * /* str */ ); -#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 - _XFUNCPROTOEND #endif /* _XPEXTUTIL_H */ |