[PATCH] Prevent shape.h being included in the server

[Julien Cristau]

fixesproto includes shape.h, but doesn't want client side headers.  This
needs to be fixed there, but work around this in shape.h anyway so we
don't break older xfixesproto.h.
---
 include/X11/extensions/shape.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/include/X11/extensions/shape.h b/include/X11/extensions/shape.h
index 6fa83d9..7992f7a 100644
--- a/include/X11/extensions/shape.h
+++ b/include/X11/extensions/shape.h
@@ -33,6 +33,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xfuncproto.h>
 #include <X11/extensions/shapeconst.h>
 
+#ifndef _SHAPE_SERVER_
 #include <X11/Xutil.h>
 
 typedef struct {
@@ -149,4 +150,6 @@ extern XRectangle *XShapeGetRectangles (
 
 _XFUNCPROTOEND
 
+#endif /* !_SHAPE_SERVER_ */
+
 #endif /* _SHAPE_H_ */
-- 
1.6.3.3


--qMm9M+Fa2AknHoGS
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0001-fixesproto-adjust-to-split-xext-headers.patch"