Move Xserver API for security extension to securitysrv.h

This commit is contained in:
Alan Coopersmith 2006-06-20 18:22:51 -07:00 committed by Alan Coopersmith
parent a544359465
commit d44b2a0a57
16 changed files with 17 additions and 31 deletions

View File

@ -44,8 +44,7 @@ from The Open Group.
#define _XAG_SERVER_ #define _XAG_SERVER_
#include <X11/extensions/Xagstr.h> #include <X11/extensions/Xagstr.h>
#include <X11/extensions/Xagsrv.h> #include <X11/extensions/Xagsrv.h>
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/security.h>
#include <X11/Xfuncproto.h> #include <X11/Xfuncproto.h>
#define XSERV_t #define XSERV_t

View File

@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group.
#include "gcstruct.h" #include "gcstruct.h"
#include "colormapst.h" #include "colormapst.h"
#include "propertyst.h" #include "propertyst.h"
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/securstr.h> #include <X11/extensions/securstr.h>
#include <assert.h> #include <assert.h>
#include <stdarg.h> #include <stdarg.h>

View File

@ -73,8 +73,7 @@ SOFTWARE.
#include <X11/extensions/XKBsrv.h> #include <X11/extensions/XKBsrv.h>
#endif #endif
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/security.h>
#endif #endif
#include "dispatch.h" #include "dispatch.h"

View File

@ -108,8 +108,7 @@ int ProcInitialConnection();
#include "panoramiXsrv.h" #include "panoramiXsrv.h"
#endif #endif
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/security.h>
#endif #endif
#ifdef XAPPGROUP #ifdef XAPPGROUP
#include <X11/extensions/Xagsrv.h> #include <X11/extensions/Xagsrv.h>

View File

@ -98,8 +98,7 @@ Author: Adobe Systems Incorporated
#define XK_LATIN1 #define XK_LATIN1
#include <X11/keysymdef.h> #include <X11/keysymdef.h>
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/security.h>
#endif #endif
/* /*

View File

@ -139,8 +139,7 @@ extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
#endif #endif
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/security.h>
#endif #endif
#ifdef XEVIE #ifdef XEVIE

View File

@ -62,8 +62,7 @@ SOFTWARE.
#include "scrnintstr.h" #include "scrnintstr.h"
#include "dispatch.h" #include "dispatch.h"
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/security.h>
#endif #endif
#define EXTENSION_BASE 128 #define EXTENSION_BASE 128

View File

@ -61,8 +61,7 @@ SOFTWARE.
#include "dispatch.h" #include "dispatch.h"
#include "swaprep.h" #include "swaprep.h"
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/security.h>
#endif #endif
/***************************************************************** /*****************************************************************

View File

@ -130,8 +130,7 @@ Equipment Corporation.
#include <X11/extensions/Xagsrv.h> #include <X11/extensions/Xagsrv.h>
#endif #endif
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/security.h>
#endif #endif
/****** /******

View File

@ -35,9 +35,8 @@
#include "win.h" #include "win.h"
/* Includes for authorization */ /* Includes for authorization */
#include "X11/Xauth.h" #include <X11/Xauth.h>
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/security.h>
#include <X11/extensions/securstr.h> #include <X11/extensions/securstr.h>

View File

@ -244,7 +244,7 @@ typedef void (*InitExtension)(INITARGS);
#include <X11/extensions/Xagstr.h> #include <X11/extensions/Xagstr.h>
#endif #endif
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/securstr.h> #include <X11/extensions/securstr.h>
#endif #endif
#ifdef PANORAMIX #ifdef PANORAMIX

View File

@ -203,8 +203,7 @@ SOFTWARE.
#include "osdep.h" #include "osdep.h"
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/security.h>
#endif #endif
#ifndef PATH_MAX #ifndef PATH_MAX

View File

@ -48,8 +48,7 @@ from The Open Group.
# include <sys/types.h> # include <sys/types.h>
# include <sys/stat.h> # include <sys/stat.h>
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER # include "securitysrv.h"
# include <X11/extensions/security.h>
#endif #endif
#ifdef WIN32 #ifdef WIN32
#include <X11/Xw32defs.h> #include <X11/Xw32defs.h>

View File

@ -151,8 +151,7 @@ extern __const__ int _nfiles;
#include <X11/extensions/Xagsrv.h> #include <X11/extensions/Xagsrv.h>
#endif #endif
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/security.h>
#endif #endif
#ifdef X_NOT_POSIX #ifdef X_NOT_POSIX

View File

@ -37,8 +37,7 @@ from The Open Group.
#include "swaprep.h" #include "swaprep.h"
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/security.h>
#endif #endif
static char InvalidPolicyReason[] = "invalid policy specification"; static char InvalidPolicyReason[] = "invalid policy specification";

View File

@ -120,8 +120,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/XKBsrv.h> #include <X11/extensions/XKBsrv.h>
#endif #endif
#ifdef XCSECURITY #ifdef XCSECURITY
#define _SECURITY_SERVER #include "securitysrv.h"
#include <X11/extensions/security.h>
#endif #endif
#ifdef RENDER #ifdef RENDER