From: Peter Harris <pharris@opentext.com>
Date: Wed, 20 Oct 2010 16:05:37 +0000 (-0400)
Subject: [xkb] Rename type, sequence, and length
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e172bed68294746981eebbaa0c0740c00a0c8bd4;p=free-sw%2Fxcb%2Fproto

[xkb] Rename type, sequence, and length

These fields are already defined by the protocol. Rename them to avoid
potential name collisions.

Signed-off-by: Peter Harris <pharris@opentext.com>
---

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" />