Merge remote-tracking branch 'krh/keysyms'

[platform/upstream/libxkbcommon.git] / src / xkbcomp / compat.c

diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index e9b6c14..f8b32a7 100644 (file)
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -773,8 +773,8 @@ CopyInterps(CompatInfo * info,
     for (si = info->interps; si; si = (SymInterpInfo *) si->defs.next)
     {
         if (((si->interp.match & XkbSI_OpMask) != pred) ||
-            (needSymbol && (si->interp.sym == XKB_KEYSYM_NO_SYMBOL)) ||
-            ((!needSymbol) && (si->interp.sym != XKB_KEYSYM_NO_SYMBOL)))
+            (needSymbol && (si->interp.sym == XKB_KEY_NoSymbol)) ||
+            ((!needSymbol) && (si->interp.sym != XKB_KEY_NoSymbol)))
             continue;
         if (compat->num_si >= compat->size_si)
         {
@@ -886,7 +886,7 @@ UpdateActionMods(struct xkb_keymap *keymap, union xkb_action *act,
 /**
  * Find an interpretation which applies to this particular level, either by
  * finding an exact match for the symbol and modifier combination, or a
- * generic XKB_KEYSYM_NO_SYMBOL match.
+ * generic XKB_KEY_NoSymbol match.
  */
 static struct xkb_sym_interpret *
 FindInterpForKey(struct xkb_keymap *keymap, xkb_keycode_t key,
@@ -907,7 +907,7 @@ FindInterpForKey(struct xkb_keymap *keymap, xkb_keycode_t key,
         bool found;
 
         if ((num_syms > 1 || interp->sym != syms[0]) &&
-            interp->sym != XKB_KEYSYM_NO_SYMBOL)
+            interp->sym != XKB_KEY_NoSymbol)
             continue;
 
         if (level == 0 || !(interp->match & XkbSI_LevelOneOnly))
@@ -936,7 +936,7 @@ FindInterpForKey(struct xkb_keymap *keymap, xkb_keycode_t key,
             break;
         }
 
-        if (found && interp->sym != XKB_KEYSYM_NO_SYMBOL)
+        if (found && interp->sym != XKB_KEY_NoSymbol)
             return interp;
         else if (found && !ret)
             ret = interp;