From 3f8a5475c917326c780f87e3f2dff11cd7d17d0f Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 5 Apr 2024 16:46:59 +0200
Subject: [PATCH] xkb: unexport remaining internal declarations

These are only used inside xkb/*, so no need to keep them exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1729>
---
 include/xkbfile.h  | 49 ----------------------------------------------
 xkb/ddxLoad.c      |  1 +
 xkb/xkbfile_priv.h | 45 ++++++++++++++++++++++++++++++++++++++++++
 xkb/xkmread.c      |  1 +
 4 files changed, 47 insertions(+), 49 deletions(-)
 create mode 100644 xkb/xkbfile_priv.h

diff --git a/include/xkbfile.h b/include/xkbfile.h
index 172d0c1f7..9bc25cd94 100644
--- a/include/xkbfile.h
+++ b/include/xkbfile.h
@@ -29,53 +29,4 @@
 
 #include "xkbstr.h"
 
-typedef void (*XkbFileAddOnFunc) (FILE * /* file */ ,
-                                  XkbDescPtr /* result */ ,
-                                  Bool /* topLevel */ ,
-                                  Bool /* showImplicit */ ,
-                                  int /* fileSection */ ,
-                                  void *        /* priv */
-    );
-
-/***====================================================================***/
-
-#define	_XkbSuccess			0	/* unused */
-#define	_XkbErrMissingNames		1
-#define	_XkbErrMissingTypes		2
-#define	_XkbErrMissingReqTypes		3
-#define	_XkbErrMissingSymbols		4
-#define	_XkbErrMissingVMods		5	/* unused */
-#define	_XkbErrMissingIndicators	6	/* unused */
-#define	_XkbErrMissingCompatMap		7
-#define	_XkbErrMissingSymInterps	8	/* unused */
-#define	_XkbErrMissingGeometry		9
-#define	_XkbErrIllegalDoodad		10	/* unused */
-#define	_XkbErrIllegalTOCType		11	/* unused */
-#define	_XkbErrIllegalContents		12
-#define	_XkbErrEmptyFile		13	/* unused */
-#define	_XkbErrFileNotFound		14	/* unused */
-#define	_XkbErrFileCannotOpen		15	/* unused */
-#define	_XkbErrBadValue			16
-#define	_XkbErrBadMatch			17
-#define	_XkbErrBadTypeName		18
-#define	_XkbErrBadTypeWidth		19
-#define	_XkbErrBadFileType		20
-#define	_XkbErrBadFileVersion		21
-#define	_XkbErrBadFileFormat		22	/* unused */
-#define	_XkbErrBadAlloc			23
-#define	_XkbErrBadLength		24
-#define	_XkbErrXReqFailure		25	/* unused */
-#define	_XkbErrBadImplementation	26
-
-/***====================================================================***/
-
-_XFUNCPROTOBEGIN
-
-extern _X_EXPORT unsigned XkmReadFile(FILE * /* file */ ,
-                                      unsigned /* need */ ,
-                                      unsigned /* want */ ,
-                                      XkbDescPtr *      /* result */
-    );
-
-_XFUNCPROTOEND
 #endif                          /* _XKBFILE_H_ */
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 4446af8dc..a9a7ead59 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -40,6 +40,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "os/osdep.h"
+#include "xkb/xkbfile_priv.h"
 #include "xkb/xkbfmisc_priv.h"
 
 #include "inputstr.h"
diff --git a/xkb/xkbfile_priv.h b/xkb/xkbfile_priv.h
new file mode 100644
index 000000000..3a37b9d49
--- /dev/null
+++ b/xkb/xkbfile_priv.h
@@ -0,0 +1,45 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ * Copyright © 1994 by Silicon Graphics Computer Systems, Inc.
+ */
+#ifndef _XSERVER_XKB_XKBFILE_PRIV_H
+#define _XSERVER_XKB_XKBFILE_PRIV_H
+
+#include <stdio.h>
+#include <X11/X.h>
+#include <X11/Xdefs.h>
+
+#include "xkbstr.h"
+
+/* XKB error codes */
+#define _XkbErrMissingNames		1
+#define _XkbErrMissingTypes		2
+#define _XkbErrMissingReqTypes		3
+#define _XkbErrMissingSymbols		4
+#define _XkbErrMissingCompatMap		7
+#define _XkbErrMissingGeometry		9
+#define _XkbErrIllegalContents		12
+#define _XkbErrBadValue			16
+#define _XkbErrBadMatch			17
+#define _XkbErrBadTypeName		18
+#define _XkbErrBadTypeWidth		19
+#define _XkbErrBadFileType		20
+#define _XkbErrBadFileVersion		21
+#define _XkbErrBadAlloc			23
+#define _XkbErrBadLength		24
+#define _XkbErrBadImplementation	26
+
+/*
+ * read xkm file
+ *
+ * @param file the FILE to read from
+ * @param need mask of needed elements (fails if some are missing)
+ * @param want mask of wanted elements
+ * @param result pointer to xkb descriptor to load the data into
+ * @return mask of elements missing (from need | want)
+ */
+unsigned XkmReadFile(FILE *file, unsigned need, unsigned want,
+                     XkbDescPtr *result);
+
+#endif /* _XSERVER_XKB_XKBFILE_PRIV_H */
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index b40f8fc64..cdcb443ba 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -34,6 +34,7 @@
 #include <X11/keysym.h>
 #include <X11/extensions/XKMformat.h>
 
+#include "xkb/xkbfile_priv.h"
 #include "xkb/xkbfmisc_priv.h"
 
 #include "misc.h"