aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os/xdmcp.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:17:21 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:17:21 +0100
commitca0f639a4ef9ad605f0e62577c84f2be73807ff3 (patch)
tree1f13c31901460fd31786b6d50b6c9841d25be99e /nx-X11/programs/Xserver/os/xdmcp.c
parentf58006d932d907dc13d76084e9171de59ee27f16 (diff)
parent433d8186588698ce6a435fbff5e9d40a37b78be9 (diff)
downloadnx-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/xdmcp.c')
-rw-r--r--nx-X11/programs/Xserver/os/xdmcp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c
index 675e9c456..4181e52ce 100644
--- a/nx-X11/programs/Xserver/os/xdmcp.c
+++ b/nx-X11/programs/Xserver/os/xdmcp.c
@@ -21,10 +21,10 @@
#endif
#ifdef WIN32
-#include <X11/Xwinsock.h>
+#include <nx-X11/Xwinsock.h>
#endif
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
#if !defined(WIN32)
#ifndef Lynx
@@ -39,10 +39,10 @@
#include <stdio.h>
#include <stdlib.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
#include "misc.h"
-#include <X11/Xpoll.h>
+#include <nx-X11/Xpoll.h>
#include "osdep.h"
#include "input.h"
#include "dixstruct.h"
@@ -76,7 +76,7 @@
#include <X11/Xdmcp.h>
#define X_INCLUDE_NETDB_H
-#include <X11/Xos_r.h>
+#include <nx-X11/Xos_r.h>
#ifdef NX_TRANS_SOCKET