This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 43456713ba71d2e587ebbdbf0415e83f0294b1d5 Author: Ulrich Sibiller <uli42@gmx.de> Date: Mon Jan 8 22:25:35 2018 +0100 Re-enable XC-MISC extension Got dropped by accident in 9bc6ff269aa8bf4c41696ebf4a686c93729ba151 Fixes ArcticaProject/nx-libs#589 --- nx-X11/config/cf/X11.tmpl | 1 + 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 9b3e0e8..b7f9a60 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 bb47df9..1b8b9ad 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" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git