From f8ded973b8086d88ec91dfcafbd779a6202047d1 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 24 May 2011 06:34:49 +0000 Subject: Synchronised files --- X11/Xlibint.h | 7 ++++++- gl/internal/dri_interface.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/X11/Xlibint.h b/X11/Xlibint.h index 39ca4da03..a55938b5b 100644 --- a/X11/Xlibint.h +++ b/X11/Xlibint.h @@ -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 */ diff --git a/gl/internal/dri_interface.h b/gl/internal/dri_interface.h index 8098a2eb9..1564e4cea 100644 --- a/gl/internal/dri_interface.h +++ b/gl/internal/dri_interface.h @@ -818,6 +818,7 @@ struct __DRIdri2ExtensionRec { #define __DRI_IMAGE_USE_SHARE 0x0001 #define __DRI_IMAGE_USE_SCANOUT 0x0002 +#define __DRI_IMAGE_USE_CURSOR 0x0004 /** * queryImage attributes -- cgit v1.2.3