From ed6fb03363254490e41c96a667ac9d071d85e8c4 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 3 Apr 2024 15:28:34 +0200 Subject: [PATCH] xkb: move XkbSLI_IsDefault() and XkbSLI_HasOwnState() into private header These macros aren't used by any drivers, so no need to keep them exported. Signed-off-by: Enrico Weigelt, metux IT consult --- Xi/exevents.c | 2 +- include/xkbsrv.h | 3 --- xkb/xkbsrv_priv.h | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Xi/exevents.c b/Xi/exevents.c index ae0bd1887..346b65dbc 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -98,6 +98,7 @@ SOFTWARE. #include "dix/input_priv.h" #include "dix/resource_priv.h" #include "mi/mi_priv.h" +#include "xkb/xkbsrv_priv.h" #include "inputstr.h" #include "windowstr.h" @@ -112,7 +113,6 @@ SOFTWARE. #include "xiquerydevice.h" /* For List*Info */ #include "eventstr.h" #include "inpututils.h" -#include "xkbsrv.h" #define WID(w) ((w) ? ((w)->drawable.id) : 0) #define AllModifiersMask ( \ diff --git a/include/xkbsrv.h b/include/xkbsrv.h index e55abcfa6..0260a8e86 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -168,9 +168,6 @@ typedef struct _XkbSrvInfo { char overlay_perkey_state[256/8]; /* bitfield */ } XkbSrvInfoRec, *XkbSrvInfoPtr; -#define XkbSLI_IsDefault (1L<<0) -#define XkbSLI_HasOwnState (1L<<1) - typedef struct _XkbSrvLedInfo { CARD16 flags; CARD16 class; diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h index 82d107619..faf81c798 100644 --- a/xkb/xkbsrv_priv.h +++ b/xkb/xkbsrv_priv.h @@ -41,6 +41,9 @@ #define XkbSetCauseXkbReq(c,e,cl) XkbSetCauseReq(c,XkbReqCode,e,cl) #define XkbSetCauseUnknown(c) XkbSetCauseKey(c,0,0) +#define XkbSLI_IsDefault (1L<<0) +#define XkbSLI_HasOwnState (1L<<1) + void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *); void XkbForceUpdateDeviceLEDs(DeviceIntPtr keybd);