summaryrefslogtreecommitdiff
path: root/src/xkbcomp/action.h
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2012-04-11 01:55:50 +0300
committerDaniel Stone <daniel@fooishbar.org>2012-05-01 13:57:31 +0100
commit12b3495ddfbd69b2b785f26c51dbe78876c9dc00 (patch)
tree07e73e7b8adc6934f33b4e5bd5849fca04cffef9 /src/xkbcomp/action.h
parent793908a046d3e5f32f670b891c85d371b6198e83 (diff)
Remove unused 'which' and 'merge' arguments
Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Updated for xkb_desc -> xkb_keymap changes.]
Diffstat (limited to 'src/xkbcomp/action.h')
-rw-r--r--src/xkbcomp/action.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/xkbcomp/action.h b/src/xkbcomp/action.h
index 137baf7..0462d5e 100644
--- a/src/xkbcomp/action.h
+++ b/src/xkbcomp/action.h
@@ -66,8 +66,7 @@ typedef struct _ActionInfo
extern int
HandleActionDef(ExprDef *def, struct xkb_keymap *xkb,
- struct xkb_any_action *action, unsigned mergeMode,
- ActionInfo *info);
+ struct xkb_any_action *action, ActionInfo *info);
extern int
SetActionField(struct xkb_keymap *xkb, char *elem, char *field,