aboutsummaryrefslogtreecommitdiff
path: root/X11/extensions/shape.h
diff options
context:
space:
mode:
Diffstat (limited to 'X11/extensions/shape.h')
-rw-r--r--X11/extensions/shape.h32
1 files changed, 2 insertions, 30 deletions
diff --git a/X11/extensions/shape.h b/X11/extensions/shape.h
index d173efef8..66af5b1b4 100644
--- a/X11/extensions/shape.h
+++ b/X11/extensions/shape.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/include/extensions/shape.h,v 1.3 2001/12/14 19:53:29 dawes Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
@@ -25,40 +24,13 @@ in this Software without prior written authorization from The Open Group.
********************************************************/
-/* $Xorg: shape.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
#ifndef _SHAPE_H_
#define _SHAPE_H_
#include <X11/Xfuncproto.h>
-
-#define X_ShapeQueryVersion 0
-#define X_ShapeRectangles 1
-#define X_ShapeMask 2
-#define X_ShapeCombine 3
-#define X_ShapeOffset 4
-#define X_ShapeQueryExtents 5
-#define X_ShapeSelectInput 6
-#define X_ShapeInputSelected 7
-#define X_ShapeGetRectangles 8
-
-#define ShapeSet 0
-#define ShapeUnion 1
-#define ShapeIntersect 2
-#define ShapeSubtract 3
-#define ShapeInvert 4
-
-#define ShapeBounding 0
-#define ShapeClip 1
-#define ShapeInput 2
-
-#define ShapeNotifyMask (1L << 0)
-#define ShapeNotify 0
-
-#define ShapeNumberEvents (ShapeNotify + 1)
+#include <X11/extensions/shapeconst.h>
#ifndef _SHAPE_SERVER_
-
#include <X11/Xutil.h>
typedef struct {
@@ -175,6 +147,6 @@ extern XRectangle *XShapeGetRectangles (
_XFUNCPROTOEND
-#endif /* _SHAPE_SERVER_ */
+#endif /* !_SHAPE_SERVER_ */
#endif /* _SHAPE_H_ */