From 3970fa674bbe336503b943db28e57f747808598b Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 3 Apr 2024 17:25:17 +0200
Subject: [PATCH] xkb: unexport internal variables

These aren't used by any drivers/modules, and it doesn't seem make much
sense doing so, thus no need to keep them exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xfree86/common/xf86Config.c | 2 +-
 hw/xwayland/xwayland-input.c   | 2 +-
 hw/xwin/InitOutput.c           | 4 +---
 include/xkbsrv.h               | 8 --------
 xkb/ddxLoad.c                  | 2 +-
 xkb/xkbsrv_priv.h              | 7 +++++++
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 67b2278a1..a8e5073b6 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -52,6 +52,7 @@
 
 #include "dix/resource_priv.h"
 #include "os/osdep.h"
+#include "xkb/xkbsrv_priv.h"
 
 #include "xf86.h"
 #include "xf86Modes.h"
@@ -68,7 +69,6 @@
 #include "loaderProcs.h"
 #include "xf86Xinput_priv.h"
 
-#include "xkbsrv.h"
 #include "picture.h"
 #ifdef DPMSExtension
 #include "dpmsproc.h"
diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index 8a470973e..1dc8804cd 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -35,9 +35,9 @@
 #include "mi/mi_priv.h"
 #include "mi/mipointer_priv.h"
 #include "os/bug_priv.h"
+#include "xkb/xkbsrv_priv.h"
 
 #include <inputstr.h>
-#include <xkbsrv.h>
 #include <xserver-properties.h>
 #include <inpututils.h>
 #include <mipointer.h>
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 17b4c33fd..de7a3f466 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -38,6 +38,7 @@ from The Open Group.
 #include "dix/screenint_priv.h"
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
+#include "xkb/xkbsrv_priv.h"
 
 #include "winmsg.h"
 #include "winconfig.h"
@@ -48,9 +49,6 @@ from The Open Group.
 #ifdef __CYGWIN__
 #include <mntent.h>
 #endif
-#if defined(WIN32)
-#include "xkbsrv.h"
-#endif
 #ifdef RELOCATE_PROJECTROOT
 #pragma push_macro("Status")
 #undef Status
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index f75cd2b84..2a21381c3 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -213,14 +213,6 @@ typedef struct {
 
 /***====================================================================***/
 
-extern _X_EXPORT int XkbReqCode;
-extern _X_EXPORT int XkbEventBase;
-extern _X_EXPORT int XkbKeyboardErrorCode;
-extern _X_EXPORT const char *XkbBaseDirectory;
-extern _X_EXPORT const char *XkbBinDirectory;
-
-extern _X_EXPORT CARD32 xkbDebugFlags;
-
 #define	Status		int
 
 extern _X_EXPORT void XkbUseMsg(void
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 8c0ec32e0..ec92d078c 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -43,11 +43,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "xkb/xkbfile_priv.h"
 #include "xkb/xkbfmisc_priv.h"
 #include "xkb/xkbrules_priv.h"
+#include "xkb/xkbsrv_priv.h"
 
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <xkbsrv.h>
 
 #define	PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
 #define	ERROR_PREFIX	"\"> \""
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index cf01810f0..46b961734 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -116,4 +116,11 @@ extern DevPrivateKeyRec xkbDevicePrivateKeyRec;
 
 #define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, &xkbDevicePrivateKeyRec))
 
+extern int XkbReqCode;
+extern int XkbEventBase;
+extern int XkbKeyboardErrorCode;
+extern const char *XkbBaseDirectory;
+extern const char *XkbBinDirectory;
+extern CARD32 xkbDebugFlags;
+
 #endif /* _XSERVER_XKBSRV_PRIV_H_ */