From cb441fd8e5744d198946fe8c3c93c40c7a85d5a5 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Fri, 6 Jan 2023 12:26:03 -0800 Subject: [PATCH] Declare local table generic_X_keymap static and constant, and adjust reference to it. --- inc/XKeymap.h | 2 +- src/initkbd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/XKeymap.h b/inc/XKeymap.h index f349920..a3b2fcd 100644 --- a/inc/XKeymap.h +++ b/inc/XKeymap.h @@ -61,7 +61,7 @@ * triples in this array are interpreted in initkbd.c as * reusable, (Lisp keyboard) code, (X keysym) symbol */ -int generic_X_keymap[] = { +static const int generic_X_keymap[] = { 0, 107, 0x1000ff10, /* Un-named KEYSYM used on Sun kbd for F11 */ 0, 108, 0x1000ff11, /* Un-named KEYSYM used on Sun kbd for F12 */ 0, 107, XK_F11, diff --git a/src/initkbd.c b/src/initkbd.c index ec597a9..e7d1dd8 100644 --- a/src/initkbd.c +++ b/src/initkbd.c @@ -337,7 +337,7 @@ static u_char *make_X_keymap(void) { int lisp_codes_used[256]; /* Keep track of the Lisp key #s we've used */ int last_KEYSYM = -1; int sym_used = 0; - int *key_sym_pairs = generic_X_keymap; + const int *key_sym_pairs = generic_X_keymap; int i = 0; KeySym *mapping; int codecount, symspercode, minkey, maxkey;