From 8fa71927997fa557bce61b732fa08be5096cdad4 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 3 Apr 2024 13:46:24 +0200 Subject: [PATCH] (submit/xkb-errmacro) xkb: move _XkbErrCode3() and _XkbErrCode4() These are only used inside xkb.c, nowhere else, so no need to keep them in public header. Signed-off-by: Enrico Weigelt, metux IT consult --- include/xkbsrv.h | 2 -- xkb/xkb.c | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/xkbsrv.h b/include/xkbsrv.h index f7c463dab..42017093a 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -304,8 +304,6 @@ extern _X_EXPORT CARD32 xkbDebugFlags; * statement in this function". lovely. */ #define _XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff))) -#define _XkbErrCode3(a,b,c) _XkbErrCode2(a,(((unsigned int)(b))<<16)|(c)) -#define _XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d))) #define Status int diff --git a/xkb/xkb.c b/xkb/xkb.c index bc913e117..e0dc52c78 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -43,6 +43,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "xkb-procs.h" #include "protocol-versions.h" +/* "a" is a "unique" numeric identifier that just defines which error + * code statement it is. _XkbErrCode2(4, foo) means "this is the 4th error + * statement in this function". lovely. + */ +#define _XkbErrCode3(a,b,c) _XkbErrCode2(a,(((unsigned int)(b))<<16)|(c)) +#define _XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d))) int XkbEventBase; static int XkbErrorBase;