aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/misc.h
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/include/misc.h
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/include/misc.h')
-rw-r--r--nx-X11/programs/Xserver/include/misc.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/include/misc.h b/nx-X11/programs/Xserver/include/misc.h
index 1576f1433..cb3051c94 100644
--- a/nx-X11/programs/Xserver/include/misc.h
+++ b/nx-X11/programs/Xserver/include/misc.h
@@ -77,16 +77,16 @@ OF THIS SOFTWARE.
extern unsigned long globalSerialNumber;
extern unsigned long serverGeneration;
-#include <X11/Xosdefs.h>
-#include <X11/Xfuncproto.h>
-#include <X11/Xmd.h>
-#include <X11/X.h>
+#include <nx-X11/Xosdefs.h>
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/X.h>
#ifndef _XTYPEDEF_POINTER
/* Don't let Xdefs.h define 'pointer' */
#define _XTYPEDEF_POINTER 1
#endif /* _XTYPEDEF_POINTER */
-#include <X11/Xdefs.h>
+#include <nx-X11/Xdefs.h>
#ifndef IN_MODULE
#ifndef NULL
@@ -121,7 +121,7 @@ typedef struct _xReq *xReqPtr;
#include "os.h" /* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */
#ifndef IN_MODULE
-#include <X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */
+#include <nx-X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */
#endif
#define NullBox ((BoxPtr)0)