diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-05-31 14:57:06 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-05-31 14:57:06 +0000 |
| commit | eb88489dbddc2a99979f2554aade8934c17ebcff (patch) | |
| tree | 73a6e7f3fc1b5a926f8d6c1b4ee9bc711e68beb1 /lib/libXfixes/src/Xfixesint.h | |
| parent | 132c244cea98b7967fe514014b93f1c5fe105278 (diff) | |
Update to libXfixes 5.0.1
Diffstat (limited to 'lib/libXfixes/src/Xfixesint.h')
| -rw-r--r-- | lib/libXfixes/src/Xfixesint.h | 16 |
1 files changed, 14 insertions, 2 deletions
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_ */ |