diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-18 11:59:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-18 11:59:15 +0200 |
| commit | b821fe861f33d7e8a39fe4c7d885b7ff379dc476 (patch) | |
| tree | 7b3c0b22d35eadf598cff3965413a96c76d5ad39 /include/xcb/shape.h | |
| parent | 56e12b1310b1b52d00bc27e919d915255af5bf03 (diff) | |
| parent | b8a77c943fa53005b6cdb1ab792acf5ff0a131be (diff) | |
| download | vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.gz vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.bz2 vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman git update 18 okt 2013
Conflicts:
mesalib/include/GL/glext.h
mesalib/include/GL/glxext.h
Diffstat (limited to 'include/xcb/shape.h')
| -rw-r--r-- | include/xcb/shape.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/xcb/shape.h b/include/xcb/shape.h index cafe42ffb..abb63c166 100644 --- a/include/xcb/shape.h +++ b/include/xcb/shape.h @@ -47,17 +47,17 @@ typedef struct xcb_shape_kind_iterator_t { } xcb_shape_kind_iterator_t;
typedef enum xcb_shape_so_t {
- XCB_SHAPE_SO_SET,
- XCB_SHAPE_SO_UNION,
- XCB_SHAPE_SO_INTERSECT,
- XCB_SHAPE_SO_SUBTRACT,
- XCB_SHAPE_SO_INVERT
+ XCB_SHAPE_SO_SET = 0,
+ XCB_SHAPE_SO_UNION = 1,
+ XCB_SHAPE_SO_INTERSECT = 2,
+ XCB_SHAPE_SO_SUBTRACT = 3,
+ XCB_SHAPE_SO_INVERT = 4
} xcb_shape_so_t;
typedef enum xcb_shape_sk_t {
- XCB_SHAPE_SK_BOUNDING,
- XCB_SHAPE_SK_CLIP,
- XCB_SHAPE_SK_INPUT
+ XCB_SHAPE_SK_BOUNDING = 0,
+ XCB_SHAPE_SK_CLIP = 1,
+ XCB_SHAPE_SK_INPUT = 2
} xcb_shape_sk_t;
/** Opcode for xcb_shape_notify. */
|