summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Harris <pharris@opentext.com>2010-09-22 23:26:16 -0400
committerPeter Harris <pharris@opentext.com>2010-09-22 23:27:18 -0400
commit476a3fdbc9f4f6256cd64f6683f4529bab1aecec (patch)
tree1183a57f5687a6509dc1bafdccf5979d058ec30e
parent9da6ea6269f91602293ad2a4ebccceafa35123f4 (diff)
Fix 'make check'
Adds support for optional bitcase names. Partially reverts 76ca2c0b152 which appears to have added fixed_type to xproto.xml by accident. Signed-off-by: Peter Harris <pharris@opentext.com>
-rw-r--r--src/xcb.xsd1
-rw-r--r--src/xproto.xml2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/xcb.xsd b/src/xcb.xsd
index 5169b48..7fdf125 100644
--- a/src/xcb.xsd
+++ b/src/xcb.xsd
@@ -66,6 +66,7 @@ authorization from the authors.
<xsd:element ref="switch" minOccurs="0" maxOccurs="unbounded" />
</xsd:choice>
</xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="optional" />
</xsd:complexType>
<!-- switch expression -->
diff --git a/src/xproto.xml b/src/xproto.xml
index 87dd762..2d76efa 100644
--- a/src/xproto.xml
+++ b/src/xproto.xml
@@ -833,7 +833,7 @@ authorization from the authors.
<field type="CARD16" name="class" enum="WindowClass" />
<field type="VISUALID" name="visual" />
<field type="CARD32" name="value_mask" enum="CW" />
- <switch name="value_list" fixed_type="CARD32">
+ <switch name="value_list">
<fieldref>value_mask</fieldref>
<bitcase>
<enumref ref="CW">BackPixmap</enumref>