From 34bb22d576e1d07a868eb8c20537ccec84413d0c Mon Sep 17 00:00:00 2001
From: bmercer <bmercer@openbsd.org>
Date: Wed, 10 Jul 2013 19:25:00 +0000
Subject: [PATCH] Remove a merge artifact. OK matthieu

---
 lib/libXfixes/src/Xfixesint.h | 14 --------------
 1 file changed, 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_ */