summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Harris <pharris@opentext.com>2010-10-20 12:05:37 -0400
committerPeter Harris <pharris@opentext.com>2010-10-20 12:07:27 -0400
commite172bed68294746981eebbaa0c0740c00a0c8bd4 (patch)
treeb4cb571139eb558fd624557b5e730978132f0170
parent0ba74c7d503776ee133ee841b794a91d4a6c33a9 (diff)
[xkb] Rename type, sequence, and lengthHEADmaster
These fields are already defined by the protocol. Rename them to avoid potential name collisions. Signed-off-by: Peter Harris <pharris@opentext.com>
-rw-r--r--src/xkb.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xkb.xml b/src/xkb.xml
index 760d3f0..157df45 100644
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -1984,12 +1984,12 @@ authorization from the authors.
<bitcase name="types">
<enumref ref="GBNDetail">Types</enumref>
<!-- from the spec, this has to be a GetMap reply -->
- <field name="type" type="CARD8" />
+ <field name="getmap_type" type="CARD8" />
<!-- done 'emulating' GetMap reply header-->
<field name="typeDeviceID" type="CARD8" />
<!-- from the spec, this has to be a GetMap reply -->
- <field name="sequence" type="CARD16" />
- <field name="length" type="CARD32" />
+ <field name="getmap_sequence" type="CARD16" />
+ <field name="getmap_length" type="CARD32" />
<!-- done 'emulating' GetMap reply header-->
<pad bytes="2" />
<field name="typeMinKeyCode" type="KEYCODE" />