diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-18 08:28:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-18 08:28:35 +0200 |
| commit | 230fe896faed312ef22d915e871fb5aee3ecfad0 (patch) | |
| tree | 971b0c0899c72496f97970319bfadfae383abbea /libxcb/xcb-proto/src/xfixes.xml | |
| parent | 180290f941da61bd80284d817e27c01cf789ee53 (diff) | |
| parent | b071050b9eda9d5e5185e582dbe9f4adba863ccc (diff) | |
| download | vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.tar.gz vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.tar.bz2 vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 libXmu libxcb/xcb-proto mesa mkfontscale pixman xkeyboard-config git update 18 June 2013
Diffstat (limited to 'libxcb/xcb-proto/src/xfixes.xml')
| -rw-r--r-- | libxcb/xcb-proto/src/xfixes.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libxcb/xcb-proto/src/xfixes.xml b/libxcb/xcb-proto/src/xfixes.xml index cbc75427b..7b9be170b 100644 --- a/libxcb/xcb-proto/src/xfixes.xml +++ b/libxcb/xcb-proto/src/xfixes.xml @@ -336,7 +336,7 @@ authorization from the authors. <xidtype name="BARRIER" /> - <enum name="DirectionMask"> + <enum name="BarrierDirections"> <item name="PositiveX"><bit>0</bit></item> <item name="PositiveY"><bit>1</bit></item> <item name="NegativeX"><bit>2</bit></item> @@ -350,7 +350,7 @@ authorization from the authors. <field type="CARD16" name="y1" /> <field type="CARD16" name="x2" /> <field type="CARD16" name="y2" /> - <field type="CARD32" name="directions" mask="DirectionMask" /> + <field type="CARD32" name="directions" mask="BarrierDirections" /> <pad bytes="2" /> <field type="CARD16" name="num_devices" /> <list type="CARD16" name="devices"><fieldref>num_devices</fieldref></list> |