From 6c86b9335e7a5124b7562ded7c8a69d6e4abc85e Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 4 Apr 2024 15:00:27 +0200
Subject: [PATCH] (!1799) xkb: unexport XkbGetCoreMap()

Not used by any drivers, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xi/getkmap.c      | 7 ++++---
 include/xkbsrv.h  | 3 ---
 xkb/xkbsrv_priv.h | 1 +
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Xi/getkmap.c b/Xi/getkmap.c
index 5d9cba1d57..6cd916e75c 100644
--- a/Xi/getkmap.c
+++ b/Xi/getkmap.c
@@ -52,14 +52,15 @@ SOFTWARE.
 
 #include <dix-config.h>
 
-#include "inputstr.h"           /* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
+
+#include "xkb/xkbsrv_priv.h"
+
+#include "inputstr.h"           /* DeviceIntPtr      */
 #include "exglobals.h"
 #include "swaprep.h"
-#include "xkbsrv.h"
 #include "xkbstr.h"
-
 #include "getkmap.h"
 
 /***********************************************************************
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 2092b901fb..9f1919b2e7 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -202,9 +202,6 @@ extern _X_EXPORT void XkbFreeKeyboard(XkbDescPtr /* xkb */ ,
                                       Bool      /* freeDesc */
     );
 
-extern _X_EXPORT KeySymsPtr XkbGetCoreMap(DeviceIntPtr  /* keybd */
-    );
-
 extern _X_EXPORT void XkbApplyMappingChange(DeviceIntPtr /* pXDev */ ,
                                             KeySymsPtr /* map */ ,
                                             KeyCode /* firstKey */ ,
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 3f6954c0f3..44f9a435f9 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -138,6 +138,7 @@ void XkbUpdateDescActions(XkbDescPtr xkb, KeyCode first, CARD8 num, XkbChangesPt
 void XkbUpdateActions(DeviceIntPtr pXDev, KeyCode first, CARD8 num,
                       XkbChangesPtr pChanges, unsigned int *needChecksRtrn,
                       XkbEventCausePtr);
+KeySymsPtr XkbGetCoreMap(DeviceIntPtr keybd);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;