diff options
| author | Ran Benita <ran234@gmail.com> | 2013-03-04 13:21:42 +0200 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2013-03-18 22:20:05 +0000 |
| commit | 4bd0610f1370e9716d7b999ade01a0c188390792 (patch) | |
| tree | ff2f3e28dd9d27dfaa201b49cca1c1258dfc7205 /src | |
| parent | b06ef2b826d0d05cfa7dc2532fa22a861d901b93 (diff) | |
keycodes: remove KeyNamesInfo::merge
Not used.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/xkbcomp/keycodes.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/xkbcomp/keycodes.c b/src/xkbcomp/keycodes.c index 55a37f0..7d305ab 100644 --- a/src/xkbcomp/keycodes.c +++ b/src/xkbcomp/keycodes.c @@ -118,7 +118,6 @@ typedef struct { typedef struct { char *name; int errorCount; - enum merge_mode merge; xkb_keycode_t min_key_code; xkb_keycode_t max_key_code; @@ -232,7 +231,6 @@ InitKeyNamesInfo(KeyNamesInfo *info, struct xkb_context *ctx) { memset(info, 0, sizeof(*info)); info->ctx = ctx; - info->merge = MERGE_DEFAULT; info->min_key_code = XKB_KEYCODE_MAX; } @@ -545,7 +543,7 @@ HandleLedNameDef(KeyNamesInfo *info, LedNameDef *def, return ReportBadType(info->ctx, "indicator", "name", buf, "string"); } - ledi.merge = info->merge; + ledi.merge = merge; ledi.name = name; return AddLedName(info, merge, true, &ledi, def->ndx - 1); } |