summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2006-06-20 18:22:51 -0700
committerAlan Coopersmith <alanc@alf.(none)>2006-06-20 18:22:51 -0700
commitd44b2a0a57fb89741173c31676af0ccc822387dc (patch)
tree2895b87ba4323de9ce2f5a3dec5dcf1e10c56896 /dix
parenta54435946544a039fc333bb5e3438501d0d1ffc6 (diff)
Move Xserver API for security extension to securitysrv.h
Diffstat (limited to 'dix')
-rw-r--r--dix/devices.c3
-rw-r--r--dix/dispatch.c3
-rw-r--r--dix/dixutils.c3
-rw-r--r--dix/events.c3
-rw-r--r--dix/extension.c3
-rw-r--r--dix/property.c3
-rw-r--r--dix/window.c3
7 files changed, 7 insertions, 14 deletions
diff --git a/dix/devices.c b/dix/devices.c
index c7d3494e8..40afac96f 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 04e2ba11f..4b4eb2bc5 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 91796eade..8cf9daa67 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 b014fdbb7..c67cf8ce4 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 <X11/extensions/security.h>
+#include "securitysrv.h"
#endif
#ifdef XEVIE
diff --git a/dix/extension.c b/dix/extension.c
index f6f38fcf3..fd8727069 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 e074c68dd..35799f836 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 9fba5f832..2be01df45 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
/******