From d44b2a0a57fb89741173c31676af0ccc822387dc Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 20 Jun 2006 18:22:51 -0700 Subject: [PATCH] Move Xserver API for security extension to securitysrv.h --- Xext/appgroup.c | 3 +-- Xext/security.c | 2 +- dix/devices.c | 3 +-- dix/dispatch.c | 3 +-- dix/dixutils.c | 3 +-- dix/events.c | 3 +-- dix/extension.c | 3 +-- dix/property.c | 3 +-- dix/window.c | 3 +-- hw/xwin/winauth.c | 5 ++--- mi/miinitext.c | 2 +- os/access.c | 3 +-- os/auth.c | 3 +-- os/connection.c | 3 +-- os/secauth.c | 3 +-- os/utils.c | 3 +-- 16 files changed, 17 insertions(+), 31 deletions(-) diff --git a/Xext/appgroup.c b/Xext/appgroup.c index cf42a7d355..61c1aa0d55 100644 --- a/Xext/appgroup.c +++ b/Xext/appgroup.c @@ -44,8 +44,7 @@ from The Open Group. #define _XAG_SERVER_ #include #include -#define _SECURITY_SERVER -#include +#include "securitysrv.h" #include #define XSERV_t diff --git a/Xext/security.c b/Xext/security.c index 48a45d0a29..31f2b928b4 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group. #include "gcstruct.h" #include "colormapst.h" #include "propertyst.h" -#define _SECURITY_SERVER +#include "securitysrv.h" #include #include #include diff --git a/dix/devices.c b/dix/devices.c index c7d3494e8d..40afac96f0 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -73,8 +73,7 @@ SOFTWARE. #include #endif #ifdef XCSECURITY -#define _SECURITY_SERVER -#include +#include "securitysrv.h" #endif #include "dispatch.h" diff --git a/dix/dispatch.c b/dix/dispatch.c index 04e2ba11fb..4b4eb2bc59 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -108,8 +108,7 @@ int ProcInitialConnection(); #include "panoramiXsrv.h" #endif #ifdef XCSECURITY -#define _SECURITY_SERVER -#include +#include "securitysrv.h" #endif #ifdef XAPPGROUP #include diff --git a/dix/dixutils.c b/dix/dixutils.c index 91796eade0..8cf9daa67d 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -98,8 +98,7 @@ Author: Adobe Systems Incorporated #define XK_LATIN1 #include #ifdef XCSECURITY -#define _SECURITY_SERVER -#include +#include "securitysrv.h" #endif /* diff --git a/dix/events.c b/dix/events.c index b014fdbb7b..c67cf8ce4e 100644 --- a/dix/events.c +++ b/dix/events.c @@ -139,8 +139,7 @@ extern Bool XkbFilterEvents(ClientPtr, int, xEvent *); #endif #ifdef XCSECURITY -#define _SECURITY_SERVER -#include +#include "securitysrv.h" #endif #ifdef XEVIE diff --git a/dix/extension.c b/dix/extension.c index f6f38fcf35..fd87270696 100644 --- a/dix/extension.c +++ b/dix/extension.c @@ -62,8 +62,7 @@ SOFTWARE. #include "scrnintstr.h" #include "dispatch.h" #ifdef XCSECURITY -#define _SECURITY_SERVER -#include +#include "securitysrv.h" #endif #define EXTENSION_BASE 128 diff --git a/dix/property.c b/dix/property.c index e074c68ddd..35799f8369 100644 --- a/dix/property.c +++ b/dix/property.c @@ -61,8 +61,7 @@ SOFTWARE. #include "dispatch.h" #include "swaprep.h" #ifdef XCSECURITY -#define _SECURITY_SERVER -#include +#include "securitysrv.h" #endif /***************************************************************** diff --git a/dix/window.c b/dix/window.c index 9fba5f8325..2be01df454 100644 --- a/dix/window.c +++ b/dix/window.c @@ -130,8 +130,7 @@ Equipment Corporation. #include #endif #ifdef XCSECURITY -#define _SECURITY_SERVER -#include +#include "securitysrv.h" #endif /****** diff --git a/hw/xwin/winauth.c b/hw/xwin/winauth.c index 3d24ef4265..b57a35abfb 100644 --- a/hw/xwin/winauth.c +++ b/hw/xwin/winauth.c @@ -35,9 +35,8 @@ #include "win.h" /* Includes for authorization */ -#include "X11/Xauth.h" -#define _SECURITY_SERVER -#include +#include +#include "securitysrv.h" #include diff --git a/mi/miinitext.c b/mi/miinitext.c index 091ac6b268..51faac935f 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -244,7 +244,7 @@ typedef void (*InitExtension)(INITARGS); #include #endif #ifdef XCSECURITY -#define _SECURITY_SERVER +#include "securitysrv.h" #include #endif #ifdef PANORAMIX diff --git a/os/access.c b/os/access.c index 62af2f91fd..db52aa038d 100644 --- a/os/access.c +++ b/os/access.c @@ -203,8 +203,7 @@ SOFTWARE. #include "osdep.h" #ifdef XCSECURITY -#define _SECURITY_SERVER -#include +#include "securitysrv.h" #endif #ifndef PATH_MAX diff --git a/os/auth.c b/os/auth.c index 19c5534d3b..d170ef8d86 100644 --- a/os/auth.c +++ b/os/auth.c @@ -48,8 +48,7 @@ from The Open Group. # include # include #ifdef XCSECURITY -#define _SECURITY_SERVER -# include +# include "securitysrv.h" #endif #ifdef WIN32 #include diff --git a/os/connection.c b/os/connection.c index 21c1ea6418..697ff4e74b 100644 --- a/os/connection.c +++ b/os/connection.c @@ -151,8 +151,7 @@ extern __const__ int _nfiles; #include #endif #ifdef XCSECURITY -#define _SECURITY_SERVER -#include +#include "securitysrv.h" #endif #ifdef X_NOT_POSIX diff --git a/os/secauth.c b/os/secauth.c index 1000b4e799..8c8700812f 100644 --- a/os/secauth.c +++ b/os/secauth.c @@ -37,8 +37,7 @@ from The Open Group. #include "swaprep.h" #ifdef XCSECURITY -#define _SECURITY_SERVER -#include +#include "securitysrv.h" #endif static char InvalidPolicyReason[] = "invalid policy specification"; diff --git a/os/utils.c b/os/utils.c index 617d201194..f977b837c4 100644 --- a/os/utils.c +++ b/os/utils.c @@ -120,8 +120,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #include #endif #ifdef XCSECURITY -#define _SECURITY_SERVER -#include +#include "securitysrv.h" #endif #ifdef RENDER