From 4f0ddea222475f614e74864506df8c381f4a2bb8 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 3 Apr 2024 18:47:06 +0200 Subject: [PATCH] xkb: unexport XkbAllocCompatMap() 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/XKBAlloc.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 282ea49cd..24b1daf87 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 XkbAllocCompatMap SrvXkbAllocCompatMap #define XkbAllocControls SrvXkbAllocControls #define XkbAllocNames SrvXkbAllocNames #define XkbFreeKeyboard SrvXkbFreeKeyboard @@ -205,11 +204,6 @@ typedef struct { #define Status int -extern _X_EXPORT Status XkbAllocCompatMap(XkbDescPtr /* xkb */ , - unsigned int /* which */ , - unsigned int /* nInterpret */ - ); - extern _X_EXPORT Status XkbAllocNames(XkbDescPtr /* xkb */ , unsigned int /* which */ , int /* nTotalRG */ , diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c index 18502d661..293c3a0eb 100644 --- a/xkb/XKBAlloc.c +++ b/xkb/XKBAlloc.c @@ -42,7 +42,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /***===================================================================***/ - /*ARGSUSED*/ Status +/*ARGSUSED*/ int XkbAllocCompatMap(XkbDescPtr xkb, unsigned which, unsigned nSI) { XkbCompatMapPtr compat; diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h index 0102b26df..5d90bf7c6 100644 --- a/xkb/xkbsrv_priv.h +++ b/xkb/xkbsrv_priv.h @@ -119,6 +119,7 @@ void XkbFreeCompatMap(XkbDescPtr xkb, unsigned int which, Bool freeMap); void XkbFreeNames(XkbDescPtr xkb, unsigned int which, Bool freeMap); XkbDescPtr XkbAllocKeyboard(void); int XkbAllocIndicatorMaps(XkbDescPtr xkb); +int XkbAllocCompatMap(XkbDescPtr xkb, unsigned int which, unsigned int nInterpret); extern DevPrivateKeyRec xkbDevicePrivateKeyRec;