diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-12-15 12:55:17 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-15 12:55:17 +0100 |
| commit | 1dad092caf01d733990648e6df64cbf964df5143 (patch) | |
| tree | 39de0e643e76754a3e23ca9dd0350b8ba4f76250 /nx-X11/programs/Xserver/os/secauth.c | |
| parent | 6d70b9e3c47f27a166f4aacb522c5c1e49092dd9 (diff) | |
| parent | 2b9025f797ee322e21077e100c2ee27c2e7fa0e0 (diff) | |
| download | nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.gz nx-libs-1dad092caf01d733990648e6df64cbf964df5143.tar.bz2 nx-libs-1dad092caf01d733990648e6df64cbf964df5143.zip | |
Merge branch '3.6.x'
Diffstat (limited to 'nx-X11/programs/Xserver/os/secauth.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/secauth.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/os/secauth.c b/nx-X11/programs/Xserver/os/secauth.c index 1000b4e79..5219b488a 100644 --- a/nx-X11/programs/Xserver/os/secauth.c +++ b/nx-X11/programs/Xserver/os/secauth.c @@ -1,4 +1,3 @@ -/* $Xorg: secauth.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -24,13 +23,12 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.10 2001/08/01 00:44:59 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "os.h" #include "osdep.h" #include "dixstruct.h" @@ -38,7 +36,7 @@ from The Open Group. #ifdef XCSECURITY #define _SECURITY_SERVER -#include <X11/extensions/security.h> +#include <nx-X11/extensions/security.h> #endif static char InvalidPolicyReason[] = "invalid policy specification"; @@ -181,7 +179,7 @@ AuthSecurityCheck ( if (client->swapped) WriteSConnSetupPrefix(client, &csp); else - (void)WriteToClient(client, sz_xConnSetupPrefix, (char *) &csp); + WriteToClient(client, sz_xConnSetupPrefix, &csp); /* * Next time the client sends the real auth data, we want |