[Xcb] [PATCH 2/6] [XKB] Fix CountedString16 padding

Peter Harris pharris at opentext.com
Wed Apr 10 16:27:42 PDT 2013


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 at opentext.com>
---
 src/xkb.xml |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/src/xkb.xml b/src/xkb.xml
index 4c496bf..5fcc73e 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="&">
+					<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">
-- 
1.7.2.5



More information about the Xcb mailing list