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 /Xext/security.c | |
| 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 'Xext/security.c')
| -rw-r--r-- | Xext/security.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Xext/security.c b/Xext/security.c index 957f083a6..f80d46406 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -40,7 +40,7 @@ in this Software without prior written authorization from The Open Group. #include "colormapst.h" #include "propertyst.h" #include "xacestr.h" -#define _SECURITY_SERVER +#include "securitysrv.h" #include <X11/extensions/securstr.h> #include <assert.h> #include <stdarg.h> |