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/Xserver/os/io.c | |
| 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/Xserver/os/io.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/io.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c index b92e7c4ae..ccfc01dfe 100644 --- a/nx-X11/programs/Xserver/os/io.c +++ b/nx-X11/programs/Xserver/os/io.c @@ -63,11 +63,11 @@ SOFTWARE. #define DEBUG_COMMUNICATION #endif #ifdef WIN32 -#include <X11/Xwinsock.h> +#include <nx-X11/Xwinsock.h> #endif #include <stdio.h> -#include <X11/Xtrans/Xtrans.h> -#include <X11/Xmd.h> +#include <nx-X11/Xtrans/Xtrans.h> +#include <nx-X11/Xmd.h> #include <errno.h> #if !defined(__UNIXOS2__) && !defined(WIN32) #ifndef Lynx @@ -76,12 +76,12 @@ SOFTWARE. #include <uio.h> #endif #endif -#include <X11/X.h> +#include <nx-X11/X.h> #define NEED_REPLIES -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "os.h" #include "osdep.h" -#include <X11/Xpoll.h> +#include <nx-X11/Xpoll.h> #include "opaque.h" #include "dixstruct.h" #include "misc.h" @@ -125,7 +125,7 @@ OsCommPtr AvailableInput = (OsCommPtr)NULL; lswaps((req)->length) : (req)->length) #ifdef BIGREQS -#include <X11/extensions/bigreqstr.h> +#include <nx-X11/extensions/bigreqstr.h> #define get_big_req_len(req,cli) ((cli)->swapped ? \ lswapl(((xBigReq *)(req))->length) : \ |