expr: unify the real and virtual modifier functions

[platform/upstream/libxkbcommon.git] / src / xkbcomp / expr.h

diff --git a/src/xkbcomp/expr.h b/src/xkbcomp/expr.h
index bab70cc..5434ad1 100644 (file)
--- a/src/xkbcomp/expr.h
+++ b/src/xkbcomp/expr.h
@@ -34,15 +34,11 @@ ExprResolveLhs(struct xkb_context *ctx, const ExprDef *expr,
 
 bool
 ExprResolveModMask(struct xkb_keymap *keymap, const ExprDef *expr,
-                   xkb_mod_mask_t *mask_rtrn);
+                   enum mod_type mod_type, xkb_mod_mask_t *mask_rtrn);
 
 bool
-ExprResolveVModMask(struct xkb_keymap *keymap, const ExprDef *expr,
-                    xkb_mod_mask_t *mask_rtrn);
-
-bool
-ExprResolveVMod(struct xkb_keymap *keymap, const ExprDef *def,
-                xkb_mod_index_t *ndx_rtrn);
+ExprResolveMod(struct xkb_keymap *keymap, const ExprDef *def,
+               enum mod_type mod_type, xkb_mod_index_t *ndx_rtrn);
 
 bool
 ExprResolveBoolean(struct xkb_context *ctx, const ExprDef *expr,