From d6d3999ccb2cb72d55820770260172eccbbb68d7 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 16 Apr 2012 09:17:34 +0200 Subject: libX11 xserver pixman mesa git update 16 Apr 2012 --- xorg-server/Xext/securitysrv.h | 45 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'xorg-server/Xext/securitysrv.h') diff --git a/xorg-server/Xext/securitysrv.h b/xorg-server/Xext/securitysrv.h index 3d3894a18..8904242d6 100644 --- a/xorg-server/Xext/securitysrv.h +++ b/xorg-server/Xext/securitysrv.h @@ -32,52 +32,51 @@ from The Open Group. /* Allow client side portions of to compile */ #ifndef Status -# define Status int -# define NEED_UNDEF_Status +#define Status int +#define NEED_UNDEF_Status #endif #ifndef Display -# define Display void -# define NEED_UNDEF_Display +#define Display void +#define NEED_UNDEF_Display #endif #include #ifdef NEED_UNDEF_Status -# undef Status -# undef NEED_UNDEF_Status +#undef Status +#undef NEED_UNDEF_Status #endif #ifdef NEED_UNDEF_Display -# undef Display -# undef NEED_UNDEF_Display +#undef Display +#undef NEED_UNDEF_Display #endif - -#include "input.h" /* for DeviceIntPtr */ -#include "property.h" /* for PropertyPtr */ -#include "pixmap.h" /* for DrawablePtr */ -#include "resource.h" /* for RESTYPE */ +#include "input.h" /* for DeviceIntPtr */ +#include "property.h" /* for PropertyPtr */ +#include "pixmap.h" /* for DrawablePtr */ +#include "resource.h" /* for RESTYPE */ /* resource type to pass in LookupIDByType for authorizations */ extern RESTYPE SecurityAuthorizationResType; /* this is what we store for an authorization */ typedef struct { - XID id; /* resource ID */ - CARD32 timeout; /* how long to live in seconds after refcnt == 0 */ - unsigned int trustLevel; /* trusted/untrusted */ - XID group; /* see embedding extension */ - unsigned int refcnt; /* how many clients connected with this auth */ - unsigned int secondsRemaining; /* overflow time amount for >49 days */ - OsTimerPtr timer; /* timer for this auth */ + XID id; /* resource ID */ + CARD32 timeout; /* how long to live in seconds after refcnt == 0 */ + unsigned int trustLevel; /* trusted/untrusted */ + XID group; /* see embedding extension */ + unsigned int refcnt; /* how many clients connected with this auth */ + unsigned int secondsRemaining; /* overflow time amount for >49 days */ + OsTimerPtr timer; /* timer for this auth */ struct _OtherClients *eventClients; /* clients wanting events */ } SecurityAuthorizationRec, *SecurityAuthorizationPtr; typedef struct { - XID group; /* the group that was sent in GenerateAuthorization */ - Bool valid; /* did anyone recognize it? if so, set to TRUE */ + XID group; /* the group that was sent in GenerateAuthorization */ + Bool valid; /* did anyone recognize it? if so, set to TRUE */ } SecurityValidateGroupInfoRec; /* Give this value or higher to the -audit option to get security messages */ #define SECURITY_AUDIT_LEVEL 4 -#endif /* _SECURITY_SRV_H */ +#endif /* _SECURITY_SRV_H */ -- cgit v1.2.3