summaryrefslogtreecommitdiff
path: root/os
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 /os
parenta54435946544a039fc333bb5e3438501d0d1ffc6 (diff)
Move Xserver API for security extension to securitysrv.h
Diffstat (limited to 'os')
-rw-r--r--os/access.c3
-rw-r--r--os/auth.c3
-rw-r--r--os/connection.c3
-rw-r--r--os/secauth.c3
-rw-r--r--os/utils.c3
5 files changed, 5 insertions, 10 deletions
diff --git a/os/access.c b/os/access.c
index 62af2f91f..db52aa038 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 19c5534d3..d170ef8d8 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 21c1ea641..697ff4e74 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 1000b4e79..8c8700812 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 617d20119..f977b837c 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