Update to libXfixes 5.0.1

17 files changed, 508 insertions, 138 deletions

diff --git a/lib/libXfixes/ChangeLog b/lib/libXfixes/ChangeLog
index 79f5b7794..be6da06e3 100644
--- a/lib/libXfixes/ChangeLog
+++ b/lib/libXfixes/ChangeLog
@@ -1,3 +1,123 @@
+commit 0cb446962381f750e05d97bfb974ca1e32481d5d
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Tue May 28 21:11:10 2013 -0700
+
+    libXfixes 5.0.1
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c480fe3271873ec7471b0cbd680f4dac18ca8904
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Apr 13 10:24:08 2013 -0700
+
+    integer overflow in XFixesGetCursorImage() [CVE-2013-1983]
+    
+    If the reported cursor dimensions or name length are too large, the
+    calculations to allocate memory for them may overflow, leaving us
+    writing beyond the bounds of the allocation.
+    
+    Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b031e3b60fa1af9e49449f23d4a84395868be3ab
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Apr 13 10:20:59 2013 -0700
+
+    Use _XEatDataWords to avoid overflow of _XEatData calculations
+    
+    rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f870dfb47da9d43d1750ea5e5fc9288c4158f7ad
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Mar 9 09:26:05 2013 -0800
+
+    XFixesFetchRegionAndBounds: use nread in call to XReadPad
+    
+    We already went through the trouble of calculating a variable with the
+    amount to read, might as well use it instead of recalculating it.
+    
+    Also move initialization of the variable to the point it's needed/used
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ad2a06d4d3c60198bc40116623153f71a208a240
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Mar 9 09:18:14 2013 -0800
+
+    Remove duplicate declaration of XFixesExtensionName in Xfixesint.h
+    
+    Silences gcc warnings:
+    In file included from Region.c:26:0:
+    Xfixesint.h:52:13: warning: redundant redeclaration of 'XFixesExtensionName' [-Wredundant-decls]
+    Xfixesint.h:34:13: note: previous declaration of 'XFixesExtensionName' was here
+    
+    In file included from Cursor.c:49:0:
+    Xfixesint.h:52:13: warning: redundant redeclaration of 'XFixesExtensionName' [-Wredundant-decls]
+    Xfixesint.h:34:13: note: previous declaration of 'XFixesExtensionName' was here
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 73a0fbb479f5b7806a3dd0741be55c9abda76220
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Jan 18 23:10:01 2013 -0800
+
+    Replace deprecated Automake INCLUDES variable with AM_CPPFLAGS
+    
+    Excerpt https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html
+    
+      - Support for the long-deprecated INCLUDES variable will be removed
+        altogether in Automake 1.14.  The AM_CPPFLAGS variable should be
+        used instead.
+    
+    This variable was deprecated in Automake releases prior to 1.10, which is
+    the current minimum level required to build X.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d6931eda2fe86566823437507b5d818458cfd002
+Author: Colin Walters <walters@verbum.org>
+Date:   Wed Jan 4 17:37:06 2012 -0500
+
+    autogen.sh: Implement GNOME Build API
+    
+    http://people.gnome.org/~walters/docs/build-api.txt
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 945803cdf3442f60ea25763a84b940e11653a205
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Jan 15 14:28:48 2013 -0500
+
+    configure: Remove AM_MAINTAINER_MODE
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 991eb6dad335f4915de8bb2d36d82f0346ae88fb
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Feb 11 15:36:33 2011 +1000
+
+    man: remove "current", we're way past 1.0.
+    
+    Claiming "the current 1.0 release" when the library is already past version
+    4 is a tad confusing.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ca7b0066fe6f315d2499338cd133e5b1e9d11236
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Sep 16 22:19:59 2011 -0700
+
+    Strip trailing whitespace
+    
+    Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
+    git diff -w & git diff -b show no diffs from this change
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
 commit 54926675a9bbb732d3317316db4958e22922ea3f
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Mon Nov 22 14:50:13 2010 -0500
diff --git a/lib/libXfixes/INSTALL b/lib/libXfixes/INSTALL
new file mode 100644
index 000000000..8b82ade08
--- /dev/null
+++ b/lib/libXfixes/INSTALL
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *Note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/lib/libXfixes/Makefile.am b/lib/libXfixes/Makefile.am
index d6a90e3ab..b5d567d1b 100644
--- a/lib/libXfixes/Makefile.am
+++ b/lib/libXfixes/Makefile.am
@@ -1,6 +1,6 @@
-# 
+#
 #  Copyright © 2003 Keith Packard, Noah Levitt
-# 
+#
 #  Permission to use, copy, modify, distribute, and sell this software and its
 #  documentation for any purpose is hereby granted without fee, provided that
 #  the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@
 #  specific, written prior permission.  Keith Packard makes no
 #  representations about the suitability of this software for any purpose.  It
 #  is provided "as is" without express or implied warranty.
-# 
+#
 #  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 #  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 #  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/lib/libXfixes/Makefile.in b/lib/libXfixes/Makefile.in
index 3821da4f5..d1efbe08b 100644
--- a/lib/libXfixes/Makefile.in
+++ b/lib/libXfixes/Makefile.in
@@ -14,9 +14,9 @@
 
 @SET_MAKE@
 
-# 
+#
 #  Copyright © 2003 Keith Packard, Noah Levitt
-# 
+#
 #  Permission to use, copy, modify, distribute, and sell this software and its
 #  documentation for any purpose is hereby granted without fee, provided that
 #  the above copyright notice appear in all copies and that both that
@@ -26,7 +26,7 @@
 #  specific, written prior permission.  Keith Packard makes no
 #  representations about the suitability of this software for any purpose.  It
 #  is provided "as is" without express or implied warranty.
-# 
+#
 #  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 #  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 #  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -249,7 +249,6 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBSTS = @MAN_SUBSTS@
@@ -341,7 +340,7 @@ all: config.h
 .SUFFIXES:
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -368,9 +367,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
@@ -381,7 +380,7 @@ config.h: stamp-h1
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+$(srcdir)/config.h.in:  $(am__configure_deps) 
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
diff --git a/lib/libXfixes/aclocal.m4 b/lib/libXfixes/aclocal.m4
index d0b280e85..f64a04b22 100644
--- a/lib/libXfixes/aclocal.m4
+++ b/lib/libXfixes/aclocal.m4
@@ -9344,44 +9344,6 @@ fi
 rmdir .tst 2>/dev/null
 AC_SUBST([am__leading_dot])])
 
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless 'enable' is passed literally.
-# For symmetry, 'disable' may be passed as well.  Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
-       [enable], [m4_define([am_maintainer_other], [disable])],
-       [disable], [m4_define([am_maintainer_other], [enable])],
-       [m4_define([am_maintainer_other], [enable])
-        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-  AC_ARG_ENABLE([maintainer-mode],
-    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
-      am_maintainer_other[ make rules and dependencies not useful
-      (and sometimes confusing) to the casual installer])],
-    [USE_MAINTAINER_MODE=$enableval],
-    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST([MAINT])dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
 # Copyright (C) 2001-2012 Free Software Foundation, Inc.
diff --git a/lib/libXfixes/configure b/lib/libXfixes/configure
index c141aac4f..80dbf1814 100644
--- a/lib/libXfixes/configure
+++ b/lib/libXfixes/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libXfixes 5.0.
+# Generated by GNU Autoconf 2.69 for libXfixes 5.0.1.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libXfixes'
 PACKAGE_TARNAME='libXfixes'
-PACKAGE_VERSION='5.0'
-PACKAGE_STRING='libXfixes 5.0'
+PACKAGE_VERSION='5.0.1'
+PACKAGE_STRING='libXfixes 5.0.1'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -711,9 +711,6 @@ build_vendor
 build_cpu
 build
 LIBTOOL
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
 am__untar
 am__tar
 AMTAR
@@ -778,7 +775,6 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_maintainer_mode
 enable_shared
 enable_static
 with_pic
@@ -1343,7 +1339,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libXfixes 5.0 to adapt to many kinds of systems.
+\`configure' configures libXfixes 5.0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1413,7 +1409,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libXfixes 5.0:";;
+     short | recursive ) echo "Configuration of libXfixes 5.0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1421,9 +1417,6 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode
-                          enable make rules and dependencies not useful (and
-                          sometimes confusing) to the casual installer
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1532,7 +1525,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libXfixes configure 5.0
+libXfixes configure 5.0.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1856,7 +1849,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libXfixes $as_me 5.0, which was
+It was created by libXfixes $as_me 5.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2685,7 +2678,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libXfixes'
- VERSION='5.0'
+ VERSION='5.0.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2732,29 +2725,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
 # Initialize libtool
 case `pwd` in
   *\ * | *\	*)
@@ -17577,6 +17547,23 @@ done
 LIBS="$SAVE_LIBS"
 
 
+# Check for _XEatDataWords function that may be patched into older Xlib releases
+SAVE_LIBS="$LIBS"
+LIBS="$FIXESEXT_LIBS"
+for ac_func in _XEatDataWords
+do :
+  ac_fn_c_check_func "$LINENO" "_XEatDataWords" "ac_cv_func__XEatDataWords"
+if test "x$ac_cv_func__XEatDataWords" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE__XEATDATAWORDS 1
+_ACEOF
+
+fi
+done
+
+LIBS="$SAVE_LIBS"
+
+
 ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile xfixes.pc"
 
 cat >confcache <<\_ACEOF
@@ -17704,10 +17691,6 @@ else
   am__EXEEXT_FALSE=
 fi
 
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18113,7 +18096,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libXfixes $as_me 5.0, which was
+This file was extended by libXfixes $as_me 5.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18179,7 +18162,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libXfixes config.status 5.0
+libXfixes config.status 5.0.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/lib/libXfixes/configure.ac b/lib/libXfixes/configure.ac
index 9fbe283a7..bad1f43e0 100644
--- a/lib/libXfixes/configure.ac
+++ b/lib/libXfixes/configure.ac
@@ -32,14 +32,13 @@ AC_PREREQ([2.60])
 # that 'revision' number appears in Xfixes.h and has to be manually
 # synchronized.
 #
-AC_INIT(libXfixes, [5.0],
+AC_INIT(libXfixes, [5.0.1],
 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfixes])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 
 # Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
 
 # Initialize libtool
 AC_PROG_LIBTOOL
@@ -65,6 +64,13 @@ AC_CHECK_FUNCS([_XEatDataWords])
 LIBS="$SAVE_LIBS"
 
 
+# Check for _XEatDataWords function that may be patched into older Xlib releases
+SAVE_LIBS="$LIBS"
+LIBS="$FIXESEXT_LIBS"
+AC_CHECK_FUNCS([_XEatDataWords])
+LIBS="$SAVE_LIBS"
+
+
 AC_CONFIG_FILES([Makefile
 		src/Makefile
 		man/Makefile
diff --git a/lib/libXfixes/include/X11/extensions/Xfixes.h b/lib/libXfixes/include/X11/extensions/Xfixes.h
index 10a7e2efb..8995d147b 100644
--- a/lib/libXfixes/include/X11/extensions/Xfixes.h
+++ b/lib/libXfixes/include/X11/extensions/Xfixes.h
@@ -133,7 +133,7 @@ XFixesChangeSaveSet (Display	*dpy,
 void
 XFixesSelectSelectionInput (Display	    *dpy,
 			    Window	    win,
-			    Atom	    selection, 
+			    Atom	    selection,
 			    unsigned long   eventMask);
 
 void
@@ -198,12 +198,12 @@ XRectangle *
 XFixesFetchRegion (Display *dpy, XserverRegion region, int *nrectanglesRet);
 
 XRectangle *
-XFixesFetchRegionAndBounds (Display *dpy, XserverRegion region, 
+XFixesFetchRegionAndBounds (Display *dpy, XserverRegion region,
 			    int *nrectanglesRet,
 			    XRectangle *bounds);
 
 void
-XFixesSetGCClipRegion (Display *dpy, GC gc, 
+XFixesSetGCClipRegion (Display *dpy, GC gc,
 		       int clip_x_origin, int clip_y_origin,
 		       XserverRegion region);
 
diff --git a/lib/libXfixes/man/Makefile.in b/lib/libXfixes/man/Makefile.in
index 003cf00b0..c595c7577 100644
--- a/lib/libXfixes/man/Makefile.in
+++ b/lib/libXfixes/man/Makefile.in
@@ -189,7 +189,6 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBSTS = @MAN_SUBSTS@
@@ -283,7 +282,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .$(LIB_MAN_SUFFIX) .man
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -308,9 +307,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
diff --git a/lib/libXfixes/man/Xfixes.man b/lib/libXfixes/man/Xfixes.man
index 075b78fac..e3568387a 100644
--- a/lib/libXfixes/man/Xfixes.man
+++ b/lib/libXfixes/man/Xfixes.man
@@ -31,9 +31,9 @@
 XFixes \- Augmented versions of core protocol requests
 .SH SYNTAX
 \&#include <X11/extensions/Xfixes.h>
-.nf    
+.nf
 .sp
-Bool XFixesQueryExtension \^(\^Display *\fIdpy\fP, 
+Bool XFixesQueryExtension \^(\^Display *\fIdpy\fP,
 	int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^);
 .sp
 Status XFixesQueryVersion \^(\^Display *\fIdpy\fP,
@@ -69,7 +69,7 @@ Extension.  This extension provides application with work arounds for
 various limitations in the core protocol.
 .SH RESTRICTIONS
 .B Xfixes
-will remain upward compatible after the current 1.0 release.
+will remain upward compatible after the 1.0 release.
 .SH AUTHORS
 Keith Packard, member of the XFree86 Project, Inc. and
 HP, Owen Taylor, member of the Gnome Foundation and Redhat, Inc.
diff --git a/lib/libXfixes/src/Makefile.am b/lib/libXfixes/src/Makefile.am
index 544230fe0..4e3f542d2 100644
--- a/lib/libXfixes/src/Makefile.am
+++ b/lib/libXfixes/src/Makefile.am
@@ -8,13 +8,12 @@ libXfixes_la_SOURCES = 	\
 	Xfixes.c	\
 	Xfixesint.h
 
-libXfixes_la_LIBADD = @FIXESEXT_LIBS@
 AM_CFLAGS = $(CWARNFLAGS) @FIXESEXT_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/include/X11/extensions
 
-INCLUDES = -I$(top_srcdir)/include/X11/extensions
-
+libXfixes_la_LIBADD = @FIXESEXT_LIBS@
 libXfixes_la_LDFLAGS = -version-number 3:1:0 -no-undefined
 
 libXfixesincludedir = $(includedir)/X11/extensions
-libXfixesinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xfixes.h 
+libXfixesinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xfixes.h
 
diff --git a/lib/libXfixes/src/Makefile.in b/lib/libXfixes/src/Makefile.in
index e2b2ae706..676a1b150 100644
--- a/lib/libXfixes/src/Makefile.in
+++ b/lib/libXfixes/src/Makefile.in
@@ -204,7 +204,6 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBSTS = @MAN_SUBSTS@
@@ -295,17 +294,17 @@ libXfixes_la_SOURCES = \
 	Xfixes.c	\
 	Xfixesint.h
 
-libXfixes_la_LIBADD = @FIXESEXT_LIBS@
 AM_CFLAGS = $(CWARNFLAGS) @FIXESEXT_CFLAGS@
-INCLUDES = -I$(top_srcdir)/include/X11/extensions
+AM_CPPFLAGS = -I$(top_srcdir)/include/X11/extensions
+libXfixes_la_LIBADD = @FIXESEXT_LIBS@
 libXfixes_la_LDFLAGS = -version-number 3:1:0 -no-undefined
 libXfixesincludedir = $(includedir)/X11/extensions
-libXfixesinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xfixes.h 
+libXfixesinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xfixes.h
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -330,9 +329,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
diff --git a/lib/libXfixes/src/Region.c b/lib/libXfixes/src/Region.c
index a20474a54..cb0cf6e09 100644
--- a/lib/libXfixes/src/Region.c
+++ b/lib/libXfixes/src/Region.c
@@ -303,8 +303,8 @@ XFixesFetchRegion (Display *dpy, XserverRegion region, int *nrectanglesRet)
 }
 
 XRectangle *
-XFixesFetchRegionAndBounds (Display	    *dpy, 
-			    XserverRegion   region, 
+XFixesFetchRegionAndBounds (Display	    *dpy,
+			    XserverRegion   region,
 			    int		    *nrectanglesRet,
 			    XRectangle	    *bounds)
 {
@@ -335,7 +335,6 @@ XFixesFetchRegionAndBounds (Display	    *dpy,
     bounds->height = rep.height;
     nbytes = (long) rep.length << 2;
     nrects = rep.length >> 1;
-    nread = nrects << 3;
     rects = Xmalloc (nrects * sizeof (XRectangle));
     if (!rects)
     {
@@ -344,7 +343,8 @@ XFixesFetchRegionAndBounds (Display	    *dpy,
 	SyncHandle ();
 	return NULL;
     }
-    _XRead16 (dpy, (short *) rects, nrects << 3);
+    nread = nrects << 3;
+    _XRead16 (dpy, (short *) rects, nread);
     /* skip any padding */
     if(nbytes > nread)
     {
@@ -357,7 +357,7 @@ XFixesFetchRegionAndBounds (Display	    *dpy,
 }
 
 void
-XFixesSetGCClipRegion (Display *dpy, GC gc, 
+XFixesSetGCClipRegion (Display *dpy, GC gc,
 		       int clip_x_origin, int clip_y_origin,
 		       XserverRegion region)
 {
diff --git a/lib/libXfixes/src/SaveSet.c b/lib/libXfixes/src/SaveSet.c
index c57ae7321..cf050a0fd 100644
--- a/lib/libXfixes/src/SaveSet.c
+++ b/lib/libXfixes/src/SaveSet.c
@@ -26,7 +26,7 @@
 #endif
 #include "Xfixesint.h"
 
-void 
+void
 XFixesChangeSaveSet (Display *dpy, Window win, int mode, int target, int map)
 {
     XFixesExtDisplayInfo	*info = XFixesFindDisplay (dpy);
diff --git a/lib/libXfixes/src/Selection.c b/lib/libXfixes/src/Selection.c
index 708d58350..7f4769ccb 100644
--- a/lib/libXfixes/src/Selection.c
+++ b/lib/libXfixes/src/Selection.c
@@ -29,7 +29,7 @@
 void
 XFixesSelectSelectionInput (Display	    *dpy,
 			    Window	    win,
-			    Atom	    selection, 
+			    Atom	    selection,
 			    unsigned long   eventMask)
 {
     XFixesExtDisplayInfo	    *info = XFixesFindDisplay (dpy);
diff --git a/lib/libXfixes/src/Xfixes.c b/lib/libXfixes/src/Xfixes.c
index 7d3af84df..c32ee3966 100644
--- a/lib/libXfixes/src/Xfixes.c
+++ b/lib/libXfixes/src/Xfixes.c
@@ -31,7 +31,7 @@ char XFixesExtensionName[] = XFIXES_NAME;
 
 static int
 XFixesCloseDisplay (Display *dpy, XExtCodes *codes);
-    
+
 static Bool
 XFixesWireToEvent(Display *dpy, XEvent *event, xEvent *wire);
 
@@ -57,13 +57,13 @@ XFixesExtAddDisplay (XFixesExtInfo *extinfo,
     info->codes = XInitExtension (dpy, ext_name);
 
     /*
-     * if the server has the extension, then we can initialize the 
+     * if the server has the extension, then we can initialize the
      * appropriate function vectors
      */
     if (info->codes) {
 	xXFixesQueryVersionReply	rep;
 	xXFixesQueryVersionReq	*req;
-        XESetCloseDisplay (dpy, info->codes->extension, 
+        XESetCloseDisplay (dpy, info->codes->extension,
                            XFixesCloseDisplay);
 	for (ev = info->codes->first_event;
 	     ev < info->codes->first_event + XFixesNumberEvents;
@@ -81,7 +81,7 @@ XFixesExtAddDisplay (XFixesExtInfo *extinfo,
 	req->xfixesReqType = X_XFixesQueryVersion;
 	req->majorVersion = XFIXES_MAJOR;
 	req->minorVersion = XFIXES_MINOR;
-	if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) 
+	if (!_XReply (dpy, (xReply *) &rep, 0, xTrue))
 	{
 	    UnlockDisplay (dpy);
 	    SyncHandle ();
@@ -123,7 +123,7 @@ XFixesExtAddDisplay (XFixesExtInfo *extinfo,
  * XFixesExtRemoveDisplay - remove the indicated display from the
  * extension object. (Replaces XextRemoveDisplay.)
  */
-static int 
+static int
 XFixesExtRemoveDisplay (XFixesExtInfo *extinfo, Display *dpy)
 {
     XFixesExtDisplayInfo *info, *prev;
@@ -164,7 +164,7 @@ XFixesExtRemoveDisplay (XFixesExtInfo *extinfo, Display *dpy)
  * XextFindDisplay.)
  */
 static XFixesExtDisplayInfo *
-XFixesExtFindDisplay (XFixesExtInfo *extinfo, 
+XFixesExtFindDisplay (XFixesExtInfo *extinfo,
 		      Display	    *dpy)
 {
     XFixesExtDisplayInfo *info;
@@ -172,7 +172,7 @@ XFixesExtFindDisplay (XFixesExtInfo *extinfo,
     /*
      * see if this was the most recently accessed display
      */
-    if ((info = extinfo->cur) && info->display == dpy) 
+    if ((info = extinfo->cur) && info->display == dpy)
 	return info;
 
     /*
@@ -198,11 +198,11 @@ XFixesFindDisplay (Display *dpy)
 
     info = XFixesExtFindDisplay (&XFixesExtensionInfo, dpy);
     if (!info)
-	info = XFixesExtAddDisplay (&XFixesExtensionInfo, dpy, 
+	info = XFixesExtAddDisplay (&XFixesExtensionInfo, dpy,
 				    XFixesExtensionName);
     return info;
 }
-    
+
 static int
 XFixesCloseDisplay (Display *dpy, XExtCodes *codes)
 {
@@ -296,24 +296,24 @@ XFixesEventToWire(Display *dpy, XEvent *event, xEvent *wire)
     return False;
 }
 
-Bool 
+Bool
 XFixesQueryExtension (Display *dpy,
 			int *event_base_return,
 			int *error_base_return)
 {
     XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy);
 
-    if (XFixesHasExtension(info)) 
+    if (XFixesHasExtension(info))
     {
 	*event_base_return = info->codes->first_event;
 	*error_base_return = info->codes->first_error;
 	return True;
-    } 
+    }
     else
 	return False;
 }
 
-Status 
+Status
 XFixesQueryVersion (Display *dpy,
 		    int	    *major_version_return,
 		    int	    *minor_version_return)
diff --git a/lib/libXfixes/src/Xfixesint.h b/lib/libXfixes/src/Xfixesint.h
index bd79227be..5ac60faff 100644
--- a/lib/libXfixes/src/Xfixesint.h
+++ b/lib/libXfixes/src/Xfixesint.h
@@ -31,8 +31,6 @@
 #include "Xfixes.h"
 #include <X11/extensions/xfixesproto.h>
 
-extern char XFixesExtensionName[];
-
 typedef struct _XFixesExtDisplayInfo {
     struct _XFixesExtDisplayInfo  *next;    /* keep a linked list */
     Display                 *display;	    /* which display this is */
@@ -76,4 +74,18 @@ static inline void _XEatDataWords(Display *dpy, unsigned long n)
 }
 #endif
 
+#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
+
 #endif /* _XFIXESINT_H_ */