diff options
author | marha <marha@users.sourceforge.net> | 2014-06-26 09:35:54 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-06-26 09:35:54 +0200 |
commit | d47db8d4713de42ccca071c9e8401fc7a213ed49 (patch) | |
tree | 7189b3c025315c514ae9d2835810b94d0e4e0e01 /libxcb/xcb-proto/src/dri2.xml | |
parent | 880395e8c3f451bf34b96da76fcee133b356e966 (diff) | |
parent | c30d5eefc96925b4bef781806c7a0114eca1b8e0 (diff) | |
download | vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.tar.gz vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.tar.bz2 vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
Opdated to openssl-1.0.1h xkeyboard-config fontconfig libX11 libxcb xcb-proto mesa xserver git update 26 June 2014
Conflicts:
openssl/Makefile
Diffstat (limited to 'libxcb/xcb-proto/src/dri2.xml')
-rw-r--r-- | libxcb/xcb-proto/src/dri2.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libxcb/xcb-proto/src/dri2.xml b/libxcb/xcb-proto/src/dri2.xml index 20d664912..3b4c12e9b 100644 --- a/libxcb/xcb-proto/src/dri2.xml +++ b/libxcb/xcb-proto/src/dri2.xml @@ -133,7 +133,10 @@ authorization from the authors. <request name="GetBuffers" opcode="5"> <field type="DRAWABLE" name="drawable" /> <field type="CARD32" name="count" /> - <list type="CARD32" name="attachments" /> + <list type="CARD32" name="attachments"> + <!-- The length field should be linked but we can't correct it without breaking API --> + <!-- <fieldref>count</fieldref> --> + </list> <reply> <pad bytes="1" /> <field type="CARD32" name="width" /> @@ -159,7 +162,10 @@ authorization from the authors. <request name="GetBuffersWithFormat" opcode="7"> <field type="DRAWABLE" name="drawable" /> <field type="CARD32" name="count" /> - <list type="AttachFormat" name="attachments" /> + <list type="AttachFormat" name="attachments"> + <!-- The length field should be linked but we can't correct it without breaking API --> + <!-- <fieldref>count</fieldref> --> + </list> <reply> <pad bytes="1" /> <field type="CARD32" name="width" /> |