diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2020-09-24 11:27:19 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2020-09-24 11:48:55 +0200 |
| commit | 4ca33228cfc0c0efa65b3cf333820442978b2e47 (patch) | |
| tree | 901bd525721fb2235ab6113b8d6e4357ca2fd0b3 | |
| parent | 64549d5fd83dc846422467346c8e287d3e7a77f5 (diff) | |
| download | kbd-4ca33228cfc0c0efa65b3cf333820442978b2e47.tar.gz | |
libkeymap: remove last ushort
Commit 6ff47cf29555 (Remove dependency on <linux/types.h> by writing out
u_char and u_short) got rid of most of linux types occurences from
the -m output of loadkeys. There was one more "ushort", so remove this
last bit.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | src/libkeymap/dump.c | 2 | ||||
| -rw-r--r-- | tests/data/dumpkeys-mktable/defkeymap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c index d67eefaa..c5a71d9d 100644 --- a/src/libkeymap/dump.c +++ b/src/libkeymap/dump.c @@ -150,7 +150,7 @@ int lk_dump_ctable(struct lk_ctx *ctx, FILE *fd) for (imax = MAX_NR_KEYMAPS - 1; imax > 0; imax--) if (lk_map_exists(ctx, imax)) break; - fprintf(fd, "ushort *key_maps[MAX_NR_KEYMAPS] = {"); + fprintf(fd, "unsigned short *key_maps[MAX_NR_KEYMAPS] = {"); for (i = 0; i <= imax; i++) { fprintf(fd, (i % 4) ? " " : "\n\t"); if (lk_map_exists(ctx, i)) diff --git a/tests/data/dumpkeys-mktable/defkeymap.c b/tests/data/dumpkeys-mktable/defkeymap.c index 5d9a3aae..b21f55ab 100644 --- a/tests/data/dumpkeys-mktable/defkeymap.c +++ b/tests/data/dumpkeys-mktable/defkeymap.c @@ -564,7 +564,7 @@ static unsigned short shift_altgr_ctrl_alt_map[NR_KEYS] = { 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, }; -ushort *key_maps[MAX_NR_KEYMAPS] = { +unsigned short *key_maps[MAX_NR_KEYMAPS] = { plain_map, shift_map, altgr_map, shift_altgr_map, ctrl_map, shift_ctrl_map, altgr_ctrl_map, shift_altgr_ctrl_map, alt_map, shift_alt_map, altgr_alt_map, shift_altgr_alt_map, |