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/mi/miscrinit.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/mi/miscrinit.c')
-rw-r--r-- | nx-X11/programs/Xserver/mi/miscrinit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/mi/miscrinit.c b/nx-X11/programs/Xserver/mi/miscrinit.c index 78e2af5a4..4950eaa93 100644 --- a/nx-X11/programs/Xserver/mi/miscrinit.c +++ b/nx-X11/programs/Xserver/mi/miscrinit.c @@ -32,7 +32,7 @@ from The Open Group. #include <dix-config.h> #endif -#include <X11/X.h> +#include <nx-X11/X.h> #include "servermd.h" #include "misc.h" #include "mi.h" @@ -42,7 +42,7 @@ from The Open Group. #include "miline.h" #ifdef MITSHM #define _XSHM_SERVER_ -#include <X11/extensions/XShm.h> +#include <nx-X11/extensions/XShm.h> #endif /* We use this structure to propogate some information from miScreenInit to |