[X2Go-Commits] [nx-libs] 01/02: nx-X11/programs/Xserver/Xext/shape.c: avoid pulling in Xlib in legacy mode via the _SHAPE_SERVER_ macro.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 1e2fc15483d795ffe36f78d802c3d67ef585894c
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Dec 16 14:45:46 2017 +0100

    nx-X11/programs/Xserver/Xext/shape.c: avoid pulling in Xlib in legacy mode via the _SHAPE_SERVER_ macro.
---
 nx-X11/programs/Xserver/Xext/shape.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c
index 505a261..693495b 100644
--- a/nx-X11/programs/Xserver/Xext/shape.c
+++ b/nx-X11/programs/Xserver/Xext/shape.c
@@ -42,6 +42,13 @@ in this Software without prior written authorization from The Open Group.
 #include "resource.h"
 #include "opaque.h"
 #ifdef LEGACY_XEXT_PROTO
+/*
+ * The legacy shape proto implementation used to distinguish between
+ * the server and client side via the _SHAPE_SERVER_ macro.
+ * If not set, shape.h pulls in Xlib, which will lead to compile
+ * errors in a server environment.
+ */
+#define _SHAPE_SERVER_
 #include <X11/extensions/shapestr.h>
 #else
 #include <X11/extensions/shapeproto.h>

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git