Move STRINGIFY to utils.h and add STRINGIFY2

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

diff --git a/src/xkbcomp/vmod.h b/src/xkbcomp/vmod.h
index 070ff69..546cf7e 100644 (file)
--- a/src/xkbcomp/vmod.h
+++ b/src/xkbcomp/vmod.h
@@ -24,29 +24,11 @@
  *
  ********************************************************/
 
-#ifndef VMOD_H
-#define VMOD_H 1
-
-#include "xkbcomp-priv.h"
-#include "expr.h"
-
-typedef struct _VModInfo {
-    xkb_mod_mask_t defined;
-    xkb_mod_mask_t available;
-} VModInfo;
-
-extern void
-InitVModInfo(VModInfo *info, struct xkb_keymap *keymap);
-
-extern void
-ClearVModInfo(VModInfo *info, struct xkb_keymap *keymap);
-
-extern bool
-HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
-              enum merge_mode mergeMode, VModInfo *info);
+#ifndef XKBCOMP_VMOD_H
+#define XKBCOMP_VMOD_H
 
 bool
-ResolveVirtualModifier(ExprDef *def, struct xkb_keymap *keymap,
-                       xkb_mod_index_t *ndx_rtrn, VModInfo *info);
+HandleVModDef(struct xkb_context *ctx, struct xkb_mod_set *mods,
+              VModDef *stmt, enum merge_mode merge);
 
-#endif /* VMOD_H */
+#endif