aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2018-01-08 22:25:35 +0100
committerUlrich Sibiller <uli42@gmx.de>2018-01-08 22:53:00 +0100
commit43456713ba71d2e587ebbdbf0415e83f0294b1d5 (patch)
tree06518a91c571596c41dd70db98e65233fcadcd4e
parent5f9f744cd8497ac250717951512fa32d266a73a1 (diff)
downloadnx-libs-43456713ba71d2e587ebbdbf0415e83f0294b1d5.tar.gz
nx-libs-43456713ba71d2e587ebbdbf0415e83f0294b1d5.tar.bz2
nx-libs-43456713ba71d2e587ebbdbf0415e83f0294b1d5.zip
Re-enable XC-MISC extension
Got dropped by accident in 9bc6ff269aa8bf4c41696ebf4a686c93729ba151 Fixes ArcticaProject/nx-libs#589
-rw-r--r--nx-X11/config/cf/X11.tmpl1
-rw-r--r--nx-X11/programs/Xserver/Xext/xcmisc.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 9b3e0e8b3..b7f9a6029 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -623,6 +623,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
DBEDefines \
XTestDefines \
XSyncDefines \
+ XCMiscDefines \
RECORDDefines \
ShmDefines \
BigReqDefines \
diff --git a/nx-X11/programs/Xserver/Xext/xcmisc.c b/nx-X11/programs/Xserver/Xext/xcmisc.c
index bb47df979..1b8b9ad37 100644
--- a/nx-X11/programs/Xserver/Xext/xcmisc.c
+++ b/nx-X11/programs/Xserver/Xext/xcmisc.c
@@ -30,8 +30,8 @@ from The Open Group.
#include <dix-config.h>
#endif
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
#include "misc.h"
#include "os.h"
#include "dixstruct.h"