aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-12-16 14:45:46 +0100
committerMihai Moldovan <ionic@ionic.de>2017-12-16 14:45:46 +0100
commit1e2fc15483d795ffe36f78d802c3d67ef585894c (patch)
treee027f19e3d441d8c12ce695e5cf9fbca47b139b3
parent3abdb99604fe4f6e49038fe0422654e123314082 (diff)
downloadnx-libs-1e2fc15483d795ffe36f78d802c3d67ef585894c.tar.gz
nx-libs-1e2fc15483d795ffe36f78d802c3d67ef585894c.tar.bz2
nx-libs-1e2fc15483d795ffe36f78d802c3d67ef585894c.zip
nx-X11/programs/Xserver/Xext/shape.c: avoid pulling in Xlib in legacy mode via the _SHAPE_SERVER_ macro.
-rw-r--r--nx-X11/programs/Xserver/Xext/shape.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c
index 505a261e5..693495b57 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>