diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-16 09:37:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-16 09:43:48 +0200 |
| commit | 00eae6f01bf11ec6a90dfc68e607b6a1a250a118 (patch) | |
| tree | b814d518076840b7433d02bc3b5957c1dd54de25 /xorg-server/Xext/securitysrv.h | |
| parent | a50d2ee664302147942dd5ed6428f9bab9d4e76a (diff) | |
| parent | d6d3999ccb2cb72d55820770260172eccbbb68d7 (diff) | |
| download | vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.gz vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.bz2 vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/securitysrv.h
xorg-server/glx/glxext.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_size_get.c
xorg-server/hw/xwin/winclip.c
xorg-server/hw/xwin/winfont.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmonitors.h
xorg-server/include/closestr.h
xorg-server/include/pixmapstr.h
xorg-server/include/servermd.h
xorg-server/include/site.h
xorg-server/include/windowstr.h
xorg-server/include/xkbstr.h
Diffstat (limited to 'xorg-server/Xext/securitysrv.h')
| -rw-r--r-- | xorg-server/Xext/securitysrv.h | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/xorg-server/Xext/securitysrv.h b/xorg-server/Xext/securitysrv.h index 68f51d2f5..b5084fea4 100644 --- a/xorg-server/Xext/securitysrv.h +++ b/xorg-server/Xext/securitysrv.h @@ -33,48 +33,47 @@ from The Open Group. /* Allow client side portions of <X11/extensions/security.h> to compile */ typedef int Status; #ifndef Display -# define Display void -# define NEED_UNDEF_Display +#define Display void +#define NEED_UNDEF_Display #endif #include <X11/extensions/secur.h> #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 */ |