From: Peter Harris <pharris@opentext.com>
Date: Wed, 10 Apr 2013 23:01:35 +0000 (-0400)
Subject: XKB: Fix CountedString16 padding
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88a0f33199f628ea953977f8ad7027b6faa2f7a7;hp=01f8c3298493d2e0d3264b54c58254c705fd9865;p=free-sw%2Fxcb%2Fproto

XKB: Fix CountedString16 padding

Should be <pad align=4>, not <pad bytes=1>. This is a very long-winded
way to write <pad align>, since libxcb doesn't support <pad align> yet.

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

diff --git a/src/xkb.xml b/src/xkb.xml
index 5207c22..0fc808c 100644
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -389,7 +389,23 @@ authorization from the authors.
 		<list name="string" type="CARD8">
 			<fieldref>length</fieldref>
 		</list>
-		<pad bytes="1" />
+		<list type="void" name="alignment_pad">
+			<op op="-">
+				<op op="&amp;">
+					<op op="+">
+						<fieldref>length</fieldref>
+						<value>5</value>
+					</op>
+					<unop op="~">
+						<value>3</value>
+					</unop>
+				</op>
+				<op op="+">
+					<fieldref>length</fieldref>
+					<value>2</value>
+				</op>
+			</op>
+		</list>
 	</struct>
 
 	<struct name="KTMapEntry">