aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os/log.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-13 13:13:55 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-13 13:13:55 +0200
commit35613d1dcaa47fbbc6aacc95fdda16b48dd8e740 (patch)
tree042738ceeb6c4cb69780f4f78dba18067c76f091 /nx-X11/programs/Xserver/os/log.c
parent734da2139827c54acff670628fedbfe9441cb913 (diff)
parentf5eff9bc0a1134a16b1a6e67bfe3d0b4d7cd49e9 (diff)
downloadnx-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/programs/Xserver/os/log.c')
-rw-r--r--nx-X11/programs/Xserver/os/log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c
index 2444cd333..84381dbf2 100644
--- a/nx-X11/programs/Xserver/os/log.c
+++ b/nx-X11/programs/Xserver/os/log.c
@@ -117,7 +117,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#ifdef NX_TRANS_SOCKET
-#include "NX.h"
+#include <nx/NX.h>
#endif