diff options
| author | Julien Cristau <jcristau@debian.org> | 2009-07-16 11:13:02 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-17 09:15:17 +1000 |
| commit | 1d1860f31f673f9cf2efb6dc59fdcf8fe625736f (patch) | |
| tree | 5d0ad7870157dbac91ce46a3b3e9b73f61d136c0 | |
| parent | dae2e0478eef5aa8a80288b417e1f8282dc0329c (diff) | |
Prevent shape.h being included in the server
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.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | 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_ */ |