From: Daniel Martin <consume.noise@gmail.com>
Date: Mon, 19 Aug 2013 21:00:21 +0000 (+0200)
Subject: xkb: Pad structs CommonDoodad and SALockDeviceBtn
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0d5c8adb19d488b0c1b3e848e1a2c3177b1e9ec;p=free-sw%2Fxcb%2Fproto

xkb: Pad structs CommonDoodad and SALockDeviceBtn

* CommonDoodad is xkbAnyDoodadWireDesc in XKBproto.h. There it has a
  size of 20 like all Doodads:
    #define sz_xkbAnyDoodadWireDesc 20
  Add the necessary 8 bytes of padding.

* SALockDeviceBtn is an Action. All Actions are handled by the server
  and libX11 with sizeof(xkbActionWireDesc) or
  SIZEOF(xkbActionWireDesc). Which results in a size of 8:
    #define sz_xkbActionWireDesc 8 /* in XKBproto.h */
  Add the necessary 3 bytes of padding.

Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Ran Benita <ran234@gmail.com>
---

diff --git a/src/xkb.xml b/src/xkb.xml
index b702cad..df5d614 100644
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -648,6 +648,7 @@ authorization from the authors.
 		<field name="top" type="INT16" />
 		<field name="left" type="INT16" />
 		<field name="angle" type="INT16" />
+		<pad bytes="8" />
 	</struct>
 
 	<struct name="ShapeDoodad">
@@ -1002,6 +1003,7 @@ authorization from the authors.
 		<pad bytes="1" />
 		<field name="button" type="CARD8" />
 		<field name="device" type="CARD8" />
+		<pad bytes="3" />
 	</struct>
 
 	<enum name="SAValWhat">