From feb5c785fc116181a41cd2abdd3559ba105369d0 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 3 Apr 2024 13:24:59 +0200 Subject: [PATCH] xkb: move *_TIMER defines into xkbAccessX.c These are only used in this file (and also not any external driver), so no need to have them in a public header file. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- include/xkbsrv.h | 6 ------ xkb/xkbAccessX.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/xkbsrv.h b/include/xkbsrv.h index bd747856b..45564e2f4 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -104,12 +104,6 @@ typedef struct _XkbEventCause { #define XkbSetCauseXkbReq(c,e,cl) XkbSetCauseReq(c,XkbReqCode,e,cl) #define XkbSetCauseUnknown(c) XkbSetCauseKey(c,0,0) -#define _OFF_TIMER 0 -#define _KRG_WARN_TIMER 1 -#define _KRG_TIMER 2 -#define _SK_TIMEOUT_TIMER 3 -#define _ALL_TIMEOUT_TIMER 4 - #define _BEEP_NONE 0 #define _BEEP_FEATURE_ON 1 #define _BEEP_FEATURE_OFF 2 diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c index f80057747..4f1fee280 100644 --- a/xkb/xkbAccessX.c +++ b/xkb/xkbAccessX.c @@ -46,6 +46,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. int XkbDfltRepeatDelay = 660; int XkbDfltRepeatInterval = 40; +#define _OFF_TIMER 0 +#define _KRG_WARN_TIMER 1 +#define _KRG_TIMER 2 +#define _SK_TIMEOUT_TIMER 3 +#define _ALL_TIMEOUT_TIMER 4 + #define DFLT_TIMEOUT_CTRLS (XkbAX_KRGMask|XkbStickyKeysMask|XkbMouseKeysMask) #define DFLT_TIMEOUT_OPTS (XkbAX_IndicatorFBMask)