From f0748c22dfaa71bc9931f3cdcc6942c3579cccc3 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 3 Apr 2024 19:33:00 +0200 Subject: [PATCH] xkb: unexport XkbCopyKeyTypes() Not used by any drivers, so no need to keep it exported. Signed-off-by: Enrico Weigelt, metux IT consult --- include/xkbsrv.h | 6 ------ xkb/XKBMAlloc.c | 2 +- xkb/xkbsrv_priv.h | 1 + 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/xkbsrv.h b/include/xkbsrv.h index c0e9580d2..4953ae346 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -28,7 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define _XKBSRV_H_ #define XkbChangeTypesOfKey SrvXkbChangeTypesOfKey -#define XkbCopyKeyTypes SrvXkbCopyKeyTypes #define XkbKeyTypesForCoreSymbols SrvXkbKeyTypesForCoreSymbols #define XkbApplyCompatMapToKey SrvXkbApplyCompatMapToKey #define XkbResizeKeyActions SrvXkbResizeKeyActions @@ -202,11 +201,6 @@ typedef struct { #define Status int -extern _X_EXPORT Status XkbCopyKeyTypes(XkbKeyTypePtr /* from */ , - XkbKeyTypePtr /* into */ , - int /* num_types */ - ); - extern _X_EXPORT Status XkbResizeKeyType(XkbDescPtr /* xkb */ , int /* type_ndx */ , int /* map_count */ , diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c index 83cb9e2f2..7bc7f4c45 100644 --- a/xkb/XKBMAlloc.c +++ b/xkb/XKBMAlloc.c @@ -249,7 +249,7 @@ XkbCopyKeyType(XkbKeyTypePtr from, XkbKeyTypePtr into) return Success; } -Status +int XkbCopyKeyTypes(XkbKeyTypePtr from, XkbKeyTypePtr into, int num_types) { register int i, rtrn; diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h index 407e43170..32617a3c9 100644 --- a/xkb/xkbsrv_priv.h +++ b/xkb/xkbsrv_priv.h @@ -123,6 +123,7 @@ int XkbAllocCompatMap(XkbDescPtr xkb, unsigned int which, unsigned int nInterpre int XkbAllocNames(XkbDescPtr xkb, unsigned int which, int nTotalRG, int nTotalAliases); int XkbAllocControls(XkbDescPtr xkb, unsigned int which); +int XkbCopyKeyTypes(XkbKeyTypePtr from, XkbKeyTypePtr into, int num_types); extern DevPrivateKeyRec xkbDevicePrivateKeyRec;