diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-06-20 18:40:18 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alanc@alf.(none)> | 2006-06-20 18:40:18 -0700 |
| commit | a46c06dab8392cf8012c7cc0b916de9a9e569671 (patch) | |
| tree | 21c6976d6406d7002e942a1dfc7728dba5e78d32 /os | |
| parent | 49b368c0bb04816c4a3579071c596b2398cae3ec (diff) | |
| parent | d44b2a0a57fb89741173c31676af0ccc822387dc (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:
Xext/appgroup.c
Xext/security.c
dix/devices.c
dix/dispatch.c
dix/dixutils.c
dix/events.c
dix/extension.c
dix/property.c
dix/window.c
os/access.c
Diffstat (limited to 'os')
| -rw-r--r-- | os/auth.c | 3 | ||||
| -rw-r--r-- | os/connection.c | 3 | ||||
| -rw-r--r-- | os/secauth.c | 3 | ||||
| -rw-r--r-- | os/utils.c | 3 |
4 files changed, 4 insertions, 8 deletions
@@ -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 eb1bcbef9..2fc3e8cec 100644 --- a/os/connection.c +++ b/os/connection.c @@ -154,8 +154,7 @@ extern __const__ int _nfiles; #include "xace.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 |