summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-11-22 23:25:50 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-11-22 23:25:59 -0800
commit2b57a94231238576ae5167ca1a4c0b35b0df172f (patch)
tree8eb540a3315ff78960cc5daa0f1b3d1e3f3c9a58 /src
parentfac4696b912898a0e171fcb93c055bd7fb99161a (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. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'src')
-rw-r--r--src/XpExtUtil.h14
1 files changed, 0 insertions, 14 deletions
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 */