diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:17:21 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:17:21 +0100 |
| commit | ca0f639a4ef9ad605f0e62577c84f2be73807ff3 (patch) | |
| tree | 1f13c31901460fd31786b6d50b6c9841d25be99e /nx-X11/programs/nxauth | |
| parent | f58006d932d907dc13d76084e9171de59ee27f16 (diff) | |
| parent | 433d8186588698ce6a435fbff5e9d40a37b78be9 (diff) | |
| download | nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.tar.gz nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.tar.bz2 nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.zip | |
Merge branch 'sunweaver-pr/NX-include-path' into 3.6.x
Attributes GH PR #61: https://github.com/ArcticaProject/nx-libs/pull/61
Diffstat (limited to 'nx-X11/programs/nxauth')
| -rw-r--r-- | nx-X11/programs/nxauth/gethost.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/nxauth/parsedpy.c | 6 | ||||
| -rw-r--r-- | nx-X11/programs/nxauth/process.c | 6 | ||||
| -rw-r--r-- | nx-X11/programs/nxauth/xauth.h | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/nx-X11/programs/nxauth/gethost.c b/nx-X11/programs/nxauth/gethost.c index cab2aea9f..fa889f29b 100644 --- a/nx-X11/programs/nxauth/gethost.c +++ b/nx-X11/programs/nxauth/gethost.c @@ -36,10 +36,10 @@ in this Software without prior written authorization from The Open Group. #endif #ifdef WIN32 -#include <X11/Xwinsock.h> +#include <nx-X11/Xwinsock.h> #define EPROTOTYPE WSAEPROTOTYPE #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include <signal.h> #include <setjmp.h> #include <ctype.h> diff --git a/nx-X11/programs/nxauth/parsedpy.c b/nx-X11/programs/nxauth/parsedpy.c index 8ce46815c..d0f022574 100644 --- a/nx-X11/programs/nxauth/parsedpy.c +++ b/nx-X11/programs/nxauth/parsedpy.c @@ -49,12 +49,12 @@ in this Software without prior written authorization from The Open Group. #include <stdio.h> /* for NULL */ #include <ctype.h> /* for isascii() and isdigit() */ -#include <X11/Xos.h> /* for strchr() and string routines */ -#include <X11/Xlib.h> /* for Family contants */ +#include <nx-X11/Xos.h> /* for strchr() and string routines */ +#include <nx-X11/Xlib.h> /* for Family contants */ #ifdef hpux #include <sys/utsname.h> /* for struct utsname */ #endif -#include <X11/Xauth.h> /* for FamilyLocal */ +#include <nx-X11/Xauth.h> /* for FamilyLocal */ #if defined(UNIXCONN) || defined(LOCALCONN) #define UNIX_CONNECTION "unix" diff --git a/nx-X11/programs/nxauth/process.c b/nx-X11/programs/nxauth/process.c index 76259d76a..86aba2b2a 100644 --- a/nx-X11/programs/nxauth/process.c +++ b/nx-X11/programs/nxauth/process.c @@ -55,10 +55,10 @@ from The Open Group. #include <sys/stat.h> #include <signal.h> -/*#include <X11/X.h>*/ /* for Family constants */ +/*#include <nx-X11/X.h>*/ /* for Family constants */ /* -#include <X11/Xlib.h> -#include <X11/extensions/security.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/extensions/security.h> */ /*FIXME*/ diff --git a/nx-X11/programs/nxauth/xauth.h b/nx-X11/programs/nxauth/xauth.h index 33a6c4e3b..4f8490070 100644 --- a/nx-X11/programs/nxauth/xauth.h +++ b/nx-X11/programs/nxauth/xauth.h @@ -29,9 +29,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/xauth/xauth.h,v 1.6 2001/12/14 20:01:15 dawes Exp $ */ #include <stdio.h> -#include <X11/Xos.h> -#include <X11/Xauth.h> -#include <X11/Xfuncs.h> +#include <nx-X11/Xos.h> +#include <nx-X11/Xauth.h> +#include <nx-X11/Xfuncs.h> #ifndef True typedef int Bool; |