summaryrefslogtreecommitdiff
path: root/src/dmx.c
diff options
context:
space:
mode:
authorMichael Joost <mehl@michael-joost.de>2013-11-18 16:11:26 +0100
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-11-22 23:12:59 -0800
commit78d267a0e0013d89a756cffe0e1dccb71945a0a4 (patch)
tree8edc51281284ef106cd1ef06efcbe4de3ad21857 /src/dmx.c
parent76e841968ceb69095eb0efcd435fc47440e86d2c (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>
Diffstat (limited to 'src/dmx.c')
-rw-r--r--src/dmx.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/dmx.c b/src/dmx.c
index d097062..5ef0ed4 100644
--- a/src/dmx.c
+++ b/src/dmx.c
@@ -86,19 +86,6 @@ static XEXT_GENERATE_FIND_DISPLAY(find_display, dmx_extension_info,
static XEXT_GENERATE_CLOSE_DISPLAY(close_display, dmx_extension_info)
-#ifndef HAVE__XEATDATAWORDS
-#include <X11/Xmd.h> /* for LONG64 on 64-bit platforms */
-
-static inline void _XEatDataWords(Display *dpy, unsigned long n)
-{
-# ifndef LONG64
- if (n >= (ULONG_MAX >> 2))
- _XIOError(dpy);
-# endif
- _XEatData (dpy, n << 2);
-}
-#endif
-
/*****************************************************************************
* *