From d4a0bed4b91da9de86c311c7fef9a8aa9a6f500c Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sat, 27 Jul 2019 07:57:27 +0000 Subject: Update to xserver 1.20.5. Tested by jsg@ --- xserver/xkb/xkbDflts.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xserver/xkb/xkbDflts.h') diff --git a/xserver/xkb/xkbDflts.h b/xserver/xkb/xkbDflts.h index 994726c0f..b02dff9de 100644 --- a/xserver/xkb/xkbDflts.h +++ b/xserver/xkb/xkbDflts.h @@ -131,7 +131,7 @@ static XkbKeyTypeRec dflt_types[] = { None, lnames_SHIFT_ALT} }; -#define num_dflt_types (sizeof(dflt_types)/sizeof(XkbKeyTypeRec)) +#define num_dflt_types ARRAY_SIZE(dflt_types) static void initTypeNames(DPYTYPE dpy) @@ -445,7 +445,7 @@ static XkbSymInterpretRec dfltSI[69] = { {XkbSA_SetMods, {0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}} }; -#define num_dfltSI (sizeof(dfltSI)/sizeof(XkbSymInterpretRec)) +#define num_dfltSI ARRAY_SIZE(dfltSI) static XkbCompatMapRec compatMap = { dfltSI, -- cgit v1.2.3