From: Daniel Stone <daniel@fooishbar.org>
Date: Wed, 23 Jun 2010 15:25:02 +0000 (+0100)
Subject: fix mod size confusion
X-Git-Tag: xkbcommon-0.2.0~864
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b74223eb50410941ec7589bffdc12183f4a23229;p=platform%2Fupstream%2Flibxkbcommon.git

fix mod size confusion

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
---

diff --git a/include/X11/extensions/XKBcommon.h b/include/X11/extensions/XKBcommon.h
index 49887fe..5b6d02c 100644
--- a/include/X11/extensions/XKBcommon.h
+++ b/include/X11/extensions/XKBcommon.h
@@ -73,8 +73,8 @@ typedef struct _XkbcAnyAction {
 typedef struct _XkbcModAction {
     unsigned char   type;
     uint8_t         flags;
+    uint8_t         real_mods;
     uint32_t        mask;
-    uint32_t        real_mods;
     uint32_t        vmods;
 } XkbcModAction;
 
@@ -90,19 +90,19 @@ typedef struct _XkbcISOAction {
     int16_t         group;
     uint32_t        mask;
     uint32_t        vmods;
-    uint32_t        real_mods;
+    uint8_t         real_mods;
     uint8_t         affect;
 } XkbcISOAction;
 
 typedef struct _XkbcCtrlsAction {
     unsigned char   type;
-    unsigned char   flags;
+    uint8_t         flags;
     uint32_t        ctrls;
 } XkbcCtrlsAction;
 
 typedef struct _XkbcDeviceBtnAction {
     unsigned char   type;
-    unsigned char   flags;
+    uint8_t         flags;
     uint16_t        device;
     uint16_t        button;
     uint8_t         count;
@@ -163,8 +163,8 @@ typedef struct _XkbcSymInterpretRec {
     CARD32          sym;
     unsigned char   flags;
     unsigned char   match;
-    unsigned char   mods;
-    unsigned char   virtual_mod;
+    uint8_t         mods; /* XXX real or virt? */
+    uint32_t        virtual_mod;
     XkbcAnyAction   act;
 } XkbcSymInterpretRec, *XkbcSymInterpretPtr;