summaryrefslogtreecommitdiff
path: root/src/XRes.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-11-22 23:22:36 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-11-22 23:22:39 -0800
commitae0ddaa9c960aee1b7845da01270b00177f95f3d (patch)
tree167c7a6fcba63e95fbc8bf549bb7fbaad74287fa /src/XRes.c
parent0f5cfdc3136dd8ef43800bda64f9d39e6b23b2e9 (diff)
downloadxorg-lib-libXRes-ae0ddaa9c960aee1b7845da01270b00177f95f3d.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>
Diffstat (limited to 'src/XRes.c')
-rw-r--r--src/XRes.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/XRes.c b/src/XRes.c
index 89fab82..2bee277 100644
--- a/src/XRes.c
+++ b/src/XRes.c
@@ -15,17 +15,6 @@
#include <assert.h>
#include <limits.h>
-#ifndef HAVE__XEATDATAWORDS
-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 _xres_ext_info_data;
static XExtensionInfo *xres_ext_info = &_xres_ext_info_data;
static const char *xres_extension_name = XRES_NAME;