diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-27 08:08:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-27 08:08:37 +0000 |
| commit | 958dcdff6d845fcff20a414bd28be8ee2ced8c6c (patch) | |
| tree | 3bc998a5af389cd1357dd672d96828573025cd0a /X11/extensions/shape.h | |
| parent | 9b02c06e9c08d3d537d0a6fed3304b2146d49511 (diff) | |
| parent | bc4f49f9a9eccb73bc2c5610295febaf4b14559e (diff) | |
| download | vcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.tar.gz vcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.tar.bz2 vcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'X11/extensions/shape.h')
| -rw-r--r-- | X11/extensions/shape.h | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/X11/extensions/shape.h b/X11/extensions/shape.h index d173efef8..7992f7a5a 100644 --- a/X11/extensions/shape.h +++ b/X11/extensions/shape.h @@ -31,34 +31,9 @@ in this Software without prior written authorization from The Open Group. #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 +150,6 @@ extern XRectangle *XShapeGetRectangles ( _XFUNCPROTOEND -#endif /* _SHAPE_SERVER_ */ +#endif /* !_SHAPE_SERVER_ */ #endif /* _SHAPE_H_ */ |