Convert missed enum merge_mode variables

Signed-off-by: Ran Benita <ran234@gmail.com>

diff --git a/src/xkbcomp/alias.c b/src/xkbcomp/alias.c
index 3f09afe..e752919 100644 (file)
--- a/src/xkbcomp/alias.c
+++ b/src/xkbcomp/alias.c
@@ -118,7 +118,8 @@ ClearAliases(AliasInfo ** info_in)
 }
 
 bool
-MergeAliases(AliasInfo ** into, AliasInfo ** merge, unsigned how_merge)
+MergeAliases(AliasInfo ** into, AliasInfo ** merge,
+             enum merge_mode how_merge)
 {
     AliasInfo *tmp;
     KeyAliasDef def;

diff --git a/src/xkbcomp/alias.h b/src/xkbcomp/alias.h
index adbba97..606f32c 100644 (file)
--- a/src/xkbcomp/alias.h
+++ b/src/xkbcomp/alias.h
@@ -44,7 +44,7 @@ extern void
 ClearAliases(AliasInfo **info);
 
 extern bool
-MergeAliases(AliasInfo **into, AliasInfo **merge, unsigned how_merge);
+MergeAliases(AliasInfo **into, AliasInfo **merge, enum merge_mode how_merge);
 
 extern int
 ApplyAliases(struct xkb_keymap *keymap, AliasInfo **info);

diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index 758014b..0e42242 100644 (file)
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -45,7 +45,7 @@ typedef struct _SymInterpInfo
 typedef struct _GroupCompatInfo
 {
     unsigned file_id;
-    unsigned char merge;
+    enum merge_mode merge;
     bool defined;
     unsigned char real_mods;
     xkb_atom_t vmods;
@@ -392,7 +392,7 @@ static bool
 HandleIncludeCompatMap(IncludeStmt *stmt, struct xkb_keymap *keymap,
                        CompatInfo *info)
 {
-    unsigned newMerge;
+    enum merge_mode newMerge;
     XkbFile *rtrn;
     CompatInfo included;
     bool haveSelf;

diff --git a/src/xkbcomp/keycodes.c b/src/xkbcomp/keycodes.c
index 8751021..d60c8a5 100644 (file)
--- a/src/xkbcomp/keycodes.c
+++ b/src/xkbcomp/keycodes.c
@@ -469,7 +469,7 @@ static bool
 HandleIncludeKeycodes(IncludeStmt *stmt, struct xkb_keymap *keymap,
                       KeyNamesInfo *info)
 {
-    unsigned newMerge;
+    enum merge_mode newMerge;
     XkbFile *rtrn;
     KeyNamesInfo included;
     bool haveSelf;

diff --git a/src/xkbcomp/keytypes.c b/src/xkbcomp/keytypes.c
index 6f83d34..9d8e7d9 100644 (file)
--- a/src/xkbcomp/keytypes.c
+++ b/src/xkbcomp/keytypes.c
@@ -335,7 +335,7 @@ static bool
 HandleIncludeKeyTypes(IncludeStmt *stmt, struct xkb_keymap *keymap,
                       KeyTypesInfo *info)
 {
-    unsigned newMerge;
+    enum merge_mode newMerge;
     XkbFile *rtrn;
     KeyTypesInfo included;
     bool haveSelf;

diff --git a/src/xkbcomp/misc.c b/src/xkbcomp/misc.c
index 7f95df2..4e69dd1 100644 (file)
--- a/src/xkbcomp/misc.c
+++ b/src/xkbcomp/misc.c
@@ -48,7 +48,7 @@ bool
 ProcessIncludeFile(struct xkb_context *ctx,
                    IncludeStmt * stmt,
                    enum xkb_file_type file_type,
-                   XkbFile ** file_rtrn, unsigned *merge_rtrn)
+                   XkbFile ** file_rtrn, enum merge_mode *merge_rtrn)
 {
     FILE *file;
     XkbFile *rtrn, *mapToUse, *next;

diff --git a/src/xkbcomp/parser.y b/src/xkbcomp/parser.y
index 419eb23..2744881 100644 (file)
--- a/src/xkbcomp/parser.y
+++ b/src/xkbcomp/parser.y
@@ -116,6 +116,7 @@ extern int yylex(union YYSTYPE *val, struct YYLTYPE *loc, void *scanner);
         enum xkb_file_type file_type;
        char            *str;
        xkb_atom_t      sval;
+        enum merge_mode merge;
        ParseCommon     *any;
        ExprDef         *expr;
        VarDef          *var;
@@ -135,7 +136,7 @@ extern int yylex(union YYSTYPE *val, struct YYLTYPE *loc, void *scanner);
 %type <num>     INTEGER FLOAT
 %type <str>     IDENT KEYNAME STRING
 %type <ival>   Number Integer Float SignedNumber
-%type <uval>   MergeMode OptMergeMode
+%type <merge>  MergeMode OptMergeMode
 %type <file_type> XkbCompositeType FileType
 %type <uval>   DoodadType Flag Flags OptFlags KeyCode
 %type <str>    KeyName MapName OptMapName KeySym

diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index ab7f224..1df5531 100644 (file)
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -795,7 +795,7 @@ static bool
 HandleIncludeSymbols(IncludeStmt *stmt, struct xkb_keymap *keymap,
                      SymbolsInfo *info)
 {
-    unsigned newMerge;
+    enum merge_mode newMerge;
     XkbFile *rtrn;
     SymbolsInfo included;
     bool haveSelf;

diff --git a/src/xkbcomp/xkbcomp-priv.h b/src/xkbcomp/xkbcomp-priv.h
index c7d771a..7b9858d 100644 (file)
--- a/src/xkbcomp/xkbcomp-priv.h
+++ b/src/xkbcomp/xkbcomp-priv.h
@@ -36,7 +36,7 @@ typedef struct _CommonInfo
 {
     unsigned short defined;
     unsigned file_id;
-    unsigned char merge;
+    enum merge_mode merge;
     struct _CommonInfo *next;
 } CommonInfo;
 
@@ -66,7 +66,7 @@ ReportBadField(const char *type, const char *field, const char *name);
 extern bool
 ProcessIncludeFile(struct xkb_context *ctx,
                    IncludeStmt *stmt, enum xkb_file_type file_type,
-                   XkbFile **file_rtrn, unsigned *merge_rtrn);
+                   XkbFile **file_rtrn, enum merge_mode *merge_rtrn);
 
 extern bool
 FindNamedKey(struct xkb_keymap *keymap, unsigned long name,