diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-13 17:04:47 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-13 17:04:47 +0100 |
| commit | e2e1bdced7e09e39fed613dae1f2f3096cb18118 (patch) | |
| tree | 63c7066c79d1053c7656b6175e22e2ced6f11e01 /libxcb/xcb-proto/src/xproto.xml | |
| parent | cc96d00cae473f472e371328ce8dc572ad258073 (diff) | |
| parent | 5cfbe97cd797d8f78ece208bb5114704b83d8aab (diff) | |
| download | vcxsrv-e2e1bdced7e09e39fed613dae1f2f3096cb18118.tar.gz vcxsrv-e2e1bdced7e09e39fed613dae1f2f3096cb18118.tar.bz2 vcxsrv-e2e1bdced7e09e39fed613dae1f2f3096cb18118.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_auth.c
libxcb/src/xcb_conn.c
libxcb/src/xcb_out.c
libxcb/src/xcb_util.c
xorg-server/dix/dispatch.c
xorg-server/include/dixstruct.h
xorg-server/include/misc.h
xorg-server/os/connection.c
Diffstat (limited to 'libxcb/xcb-proto/src/xproto.xml')
| -rw-r--r-- | libxcb/xcb-proto/src/xproto.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libxcb/xcb-proto/src/xproto.xml b/libxcb/xcb-proto/src/xproto.xml index cbb5fa2db..42a6852a1 100644 --- a/libxcb/xcb-proto/src/xproto.xml +++ b/libxcb/xcb-proto/src/xproto.xml @@ -1482,7 +1482,10 @@ authorization from the authors. <request name="SetFontPath" opcode="51"> <pad bytes="1" /> <field type="CARD16" name="font_qty" /> - <list type="char" name="path" /> + <pad bytes="2" /> + <list type="STR" name="font"> + <fieldref>font_qty</fieldref> + </list> </request> <request name="GetFontPath" opcode="52"> @@ -2295,7 +2298,7 @@ authorization from the authors. <field type="CARD8" name="family" enum="Family" /> <pad bytes="1" /> <field type="CARD16" name="address_len" /> - <list type="char" name="address"> + <list type="BYTE" name="address"> <fieldref>address_len</fieldref> </list> </request> |