summaryrefslogtreecommitdiff
path: root/lib/libXfixes/src/Xfixesint.h
diff options
context:
space:
mode:
authorBrandon Mercer <bmercer@cvs.openbsd.org>2013-07-10 19:25:01 +0000
committerBrandon Mercer <bmercer@cvs.openbsd.org>2013-07-10 19:25:01 +0000
commit02f18c69e456170f36e6bbb96bd726d1e847c9fe (patch)
tree4813161d26ca171bc9c860fcd085afb762171919 /lib/libXfixes/src/Xfixesint.h
parente5159cc0af688d4f972c084eaa7ee5d754ea85b5 (diff)
Remove a merge artifact.
OK matthieu
Diffstat (limited to 'lib/libXfixes/src/Xfixesint.h')
-rw-r--r--lib/libXfixes/src/Xfixesint.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/lib/libXfixes/src/Xfixesint.h b/lib/libXfixes/src/Xfixesint.h
index 5ac60faff..7bf5bfdb6 100644
--- a/lib/libXfixes/src/Xfixesint.h
+++ b/lib/libXfixes/src/Xfixesint.h
@@ -74,18 +74,4 @@ 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_ */