diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-08-27 15:34:16 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-08-27 15:34:16 +0000 |
| commit | 2bac4d23b683a1a41618861374616f39a5103d33 (patch) | |
| tree | 8198cf480f0ffed77106e7fae798996f1b38a058 /lib/libX11/include/X11 | |
| parent | 9056f0e1d193894344a87feaca366d3f4c797d8d (diff) | |
Update to libX11 1.4.4. Tested by ajacoutot@, shadchin@.
Diffstat (limited to 'lib/libX11/include/X11')
| -rw-r--r-- | lib/libX11/include/X11/Xlibint.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/libX11/include/X11/Xlibint.h b/lib/libX11/include/X11/Xlibint.h index 05d344ca9..2ce356d15 100644 --- a/lib/libX11/include/X11/Xlibint.h +++ b/lib/libX11/include/X11/Xlibint.h @@ -336,7 +336,7 @@ extern LockInfoPtr _Xglobal_lock; * define MALLOC_0_RETURNS_NULL. This is necessary because some * Xlib code expects malloc(0) to return a valid pointer to storage. */ -#ifdef MALLOC_0_RETURNS_NULL +#if defined(MALLOC_0_RETURNS_NULL) || defined(__clang_analyzer__) # define Xmalloc(size) malloc(((size) == 0 ? 1 : (size))) # define Xrealloc(ptr, size) realloc((ptr), ((size) == 0 ? 1 : (size))) @@ -572,6 +572,7 @@ extern LockInfoPtr _Xglobal_lock; #endif #endif +#ifndef __clang_analyzer__ #define SetReqLen(req,n,badlen) \ if ((req->length + n) > (unsigned)65535) { \ if (dpy->bigreq_size) { \ @@ -582,6 +583,10 @@ extern LockInfoPtr _Xglobal_lock; } \ } else \ req->length += n +#else +#define SetReqLen(req,n,badlen) \ + req->length += n +#endif #define SyncHandle() \ if (dpy->synchandler) (*dpy->synchandler)(dpy) @@ -787,7 +792,7 @@ typedef int (*FreeModmapType) ( */ typedef struct _XFreeFuncs { FreeFuncType atoms; /* _XFreeAtomTable */ - FreeModmapType modifiermap; /* XFreeModifierMap */ + FreeModmapType modifiermap; /* XFreeModifiermap */ FreeFuncType key_bindings; /* _XFreeKeyBindings */ FreeFuncType context_db; /* _XFreeContextDB */ FreeFuncType defaultCCCs; /* _XcmsFreeDefaultCCCs */ @@ -899,7 +904,7 @@ extern int _XError( ); extern int _XIOError( Display* /* dpy */ -); +) _X_NORETURN; extern int (*_XIOErrorFunction)( Display* /* dpy */ ); |