From 7564ed019595c8f6e29a0d69240e0cb3e69ea480 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 3 Apr 2024 18:51:12 +0200 Subject: [PATCH] xkb: unexport XkbAllocControls() Not used by any drivers, so no need to keep it exported. Signed-off-by: Enrico Weigelt, metux IT consult --- include/xkbsrv.h | 5 ----- xkb/XKBAlloc.c | 2 +- xkb/xkbsrv_priv.h | 1 + 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/xkbsrv.h b/include/xkbsrv.h index 527acc77e..c0e9580d2 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -34,7 +34,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define XkbResizeKeyActions SrvXkbResizeKeyActions #define XkbResizeKeySyms SrvXkbResizeKeySyms #define XkbResizeKeyType SrvXkbResizeKeyType -#define XkbAllocControls SrvXkbAllocControls #define XkbFreeKeyboard SrvXkbFreeKeyboard #define XkbVirtualModsToReal SrvXkbVirtualModsToReal #define XkbChangeKeycodeRange SrvXkbChangeKeycodeRange @@ -203,10 +202,6 @@ typedef struct { #define Status int -extern _X_EXPORT Status XkbAllocControls(XkbDescPtr /* xkb */ , - unsigned int /* which */ - ); - extern _X_EXPORT Status XkbCopyKeyTypes(XkbKeyTypePtr /* from */ , XkbKeyTypePtr /* into */ , int /* num_types */ diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c index 9a6926f50..b83a5fc92 100644 --- a/xkb/XKBAlloc.c +++ b/xkb/XKBAlloc.c @@ -253,7 +253,7 @@ XkbFreeNames(XkbDescPtr xkb, unsigned which, Bool freeMap) /***===================================================================***/ - /*ARGSUSED*/ Status + /*ARGSUSED*/ int XkbAllocControls(XkbDescPtr xkb, unsigned which) { if (xkb == NULL) diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h index 9cb1871e4..407e43170 100644 --- a/xkb/xkbsrv_priv.h +++ b/xkb/xkbsrv_priv.h @@ -122,6 +122,7 @@ int XkbAllocIndicatorMaps(XkbDescPtr xkb); int XkbAllocCompatMap(XkbDescPtr xkb, unsigned int which, unsigned int nInterpret); int XkbAllocNames(XkbDescPtr xkb, unsigned int which, int nTotalRG, int nTotalAliases); +int XkbAllocControls(XkbDescPtr xkb, unsigned int which); extern DevPrivateKeyRec xkbDevicePrivateKeyRec;