diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-01-08 22:58:26 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-01-08 22:58:26 +0100 |
| commit | 47ef330c59b80bcb8e06c90da862cbc1fe540e80 (patch) | |
| tree | 06518a91c571596c41dd70db98e65233fcadcd4e | |
| parent | 5f9f744cd8497ac250717951512fa32d266a73a1 (diff) | |
| parent | 43456713ba71d2e587ebbdbf0415e83f0294b1d5 (diff) | |
| download | nx-libs-47ef330c59b80bcb8e06c90da862cbc1fe540e80.tar.gz nx-libs-47ef330c59b80bcb8e06c90da862cbc1fe540e80.tar.bz2 nx-libs-47ef330c59b80bcb8e06c90da862cbc1fe540e80.zip | |
Merge branch 'uli42-pr/reenable_xc-misc' into 3.6.x
Attributes GH PR #628: https://github.com/ArcticaProject/nx-libs/pull/628
Fixes: ArcticaProject/nx-libs#589
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xcmisc.c | 4 |
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" |