xserver: Branch 'master'
Alan Coopersmith
alanc at kemper.freedesktop.org
Wed Jun 21 04:23:03 EEST 2006
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(-)
New commits:
diff-tree d44b2a0a57fb89741173c31676af0ccc822387dc (from a54435946544a039fc333bb5e3438501d0d1ffc6)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date: Tue Jun 20 18:22:51 2006 -0700
Move Xserver API for security extension to securitysrv.h
diff --git a/Xext/appgroup.c b/Xext/appgroup.c
index cf42a7d..61c1aa0 100644
--- a/Xext/appgroup.c
+++ b/Xext/appgroup.c
@@ -44,8 +44,7 @@ from The Open Group.
#define _XAG_SERVER_
#include <X11/extensions/Xagstr.h>
#include <X11/extensions/Xagsrv.h>
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
#include <X11/Xfuncproto.h>
#define XSERV_t
diff --git a/Xext/security.c b/Xext/security.c
index 48a45d0..31f2b92 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -39,7 +39,7 @@ in this Software without prior written a
#include "gcstruct.h"
#include "colormapst.h"
#include "propertyst.h"
-#define _SECURITY_SERVER
+#include "securitysrv.h"
#include <X11/extensions/securstr.h>
#include <assert.h>
#include <stdarg.h>
diff --git a/dix/devices.c b/dix/devices.c
index c7d3494..40afac9 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -73,8 +73,7 @@ SOFTWARE.
#include <X11/extensions/XKBsrv.h>
#endif
#ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
#endif
#include "dispatch.h"
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 04e2ba1..4b4eb2b 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 <X11/extensions/security.h>
+#include "securitysrv.h"
#endif
#ifdef XAPPGROUP
#include <X11/extensions/Xagsrv.h>
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 91796ea..8cf9daa 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -98,8 +98,7 @@ Author: Adobe Systems Incorporated
#define XK_LATIN1
#include <X11/keysymdef.h>
#ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
#endif
/*
diff --git a/dix/events.c b/dix/events.c
index b014fdb..c67cf8c 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -139,8 +139,7 @@ extern Bool XkbFilterEvents(ClientPtr, i
#endif
#ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
#endif
#ifdef XEVIE
diff --git a/dix/extension.c b/dix/extension.c
index f6f38fc..fd87270 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 <X11/extensions/security.h>
+#include "securitysrv.h"
#endif
#define EXTENSION_BASE 128
diff --git a/dix/property.c b/dix/property.c
index e074c68..35799f8 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 <X11/extensions/security.h>
+#include "securitysrv.h"
#endif
/*****************************************************************
diff --git a/dix/window.c b/dix/window.c
index 9fba5f8..2be01df 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -130,8 +130,7 @@ Equipment Corporation.
#include <X11/extensions/Xagsrv.h>
#endif
#ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
#endif
/******
diff --git a/hw/xwin/winauth.c b/hw/xwin/winauth.c
index 3d24ef4..b57a35a 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 <X11/extensions/security.h>
+#include <X11/Xauth.h>
+#include "securitysrv.h"
#include <X11/extensions/securstr.h>
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 091ac6b..51faac9 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -244,7 +244,7 @@ typedef void (*InitExtension)(INITARGS);
#include <X11/extensions/Xagstr.h>
#endif
#ifdef XCSECURITY
-#define _SECURITY_SERVER
+#include "securitysrv.h"
#include <X11/extensions/securstr.h>
#endif
#ifdef PANORAMIX
diff --git a/os/access.c b/os/access.c
index 62af2f9..db52aa0 100644
--- a/os/access.c
+++ b/os/access.c
@@ -203,8 +203,7 @@ SOFTWARE.
#include "osdep.h"
#ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
#endif
#ifndef PATH_MAX
diff --git a/os/auth.c b/os/auth.c
index 19c5534..d170ef8 100644
--- a/os/auth.c
+++ b/os/auth.c
@@ -48,8 +48,7 @@ from The Open Group.
# include <sys/types.h>
# include <sys/stat.h>
#ifdef XCSECURITY
-#define _SECURITY_SERVER
-# include <X11/extensions/security.h>
+# include "securitysrv.h"
#endif
#ifdef WIN32
#include <X11/Xw32defs.h>
diff --git a/os/connection.c b/os/connection.c
index 21c1ea6..697ff4e 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -151,8 +151,7 @@ extern __const__ int _nfiles;
#include <X11/extensions/Xagsrv.h>
#endif
#ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
#endif
#ifdef X_NOT_POSIX
diff --git a/os/secauth.c b/os/secauth.c
index 1000b4e..8c87008 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 <X11/extensions/security.h>
+#include "securitysrv.h"
#endif
static char InvalidPolicyReason[] = "invalid policy specification";
diff --git a/os/utils.c b/os/utils.c
index 617d201..f977b83 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -120,8 +120,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/XKBsrv.h>
#endif
#ifdef XCSECURITY
-#define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include "securitysrv.h"
#endif
#ifdef RENDER
More information about the xorg-commit
mailing list