diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-13 13:13:55 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-13 13:13:55 +0200 |
| commit | 35613d1dcaa47fbbc6aacc95fdda16b48dd8e740 (patch) | |
| tree | 042738ceeb6c4cb69780f4f78dba18067c76f091 /nx-X11/lib | |
| parent | 734da2139827c54acff670628fedbfe9441cb913 (diff) | |
| parent | f5eff9bc0a1134a16b1a6e67bfe3d0b4d7cd49e9 (diff) | |
| download | nx-libs-35613d1dcaa47fbbc6aacc95fdda16b48dd8e740.tar.gz nx-libs-35613d1dcaa47fbbc6aacc95fdda16b48dd8e740.tar.bz2 nx-libs-35613d1dcaa47fbbc6aacc95fdda16b48dd8e740.zip | |
Merge branch 'sunweaver-pr/nxcomp+ext+shad-system-wide-headers' into 3.6.x
Reviewed by Ulrich Sibiller <uli42@gmx.de>, approval given on Mon, 13 Jun 2016 02:49:19 -0700.
Diffstat (limited to 'nx-X11/lib')
| -rw-r--r-- | nx-X11/lib/X11/XlibInt.c | 6 | ||||
| -rw-r--r-- | nx-X11/lib/X11/Xlibint.h | 2 | ||||
| -rw-r--r-- | nx-X11/lib/xtrans/Xtranssock.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c index 0aa890bbb..49535fe18 100644 --- a/nx-X11/lib/X11/XlibInt.c +++ b/nx-X11/lib/X11/XlibInt.c @@ -118,12 +118,12 @@ xthread_t (*_Xthread_self_fn)(void) = NULL; #endif /* XTHREADS else */ -#include "NX.h" +#include <nx/NX.h> #ifdef NX_TRANS_SOCKET -#include "NX.h" -#include "NXvars.h" +#include <nx/NX.h> +#include <nx/NXvars.h> static struct timeval retry; diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h index 854b64b22..474b77349 100644 --- a/nx-X11/lib/X11/Xlibint.h +++ b/nx-X11/lib/X11/Xlibint.h @@ -64,7 +64,7 @@ from The Open Group. #ifdef NX_TRANS_SOCKET -#include "NXvars.h" +#include <nx/NXvars.h> #define _XGetIOError(dpy) \ (dpy -> flags & XlibDisplayIOError) diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c index b08cd9f0a..5c57fc5ba 100644 --- a/nx-X11/lib/xtrans/Xtranssock.c +++ b/nx-X11/lib/xtrans/Xtranssock.c @@ -344,7 +344,7 @@ static int haveIPv6 = 1; #ifdef TRANS_CLIENT -#include "NX.h" +#include <nx/NX.h> typedef struct { |