From 660657a2c3a28d92d5671b44bc20de49ceacf971 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 5 Apr 2024 16:33:44 +0200
Subject: [PATCH] xkb: unexport functions from xkbout.c

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 | 42 ------------------------------------------
 xkb/xkbfmisc.c    |  1 +
 xkb/xkbout.c      |  1 +
 xkb/xkbout_priv.h | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 34 insertions(+), 42 deletions(-)
 create mode 100644 xkb/xkbout_priv.h

diff --git a/include/xkbfile.h b/include/xkbfile.h
index 317f15937..172d0c1f7 100644
--- a/include/xkbfile.h
+++ b/include/xkbfile.h
@@ -71,48 +71,6 @@ typedef void (*XkbFileAddOnFunc) (FILE * /* file */ ,
 
 _XFUNCPROTOBEGIN
 
-extern _X_EXPORT Bool XkbWriteXKBKeycodes(FILE * /* file */ ,
-                                          XkbDescPtr /* result */ ,
-                                          Bool /* topLevel */ ,
-                                          Bool /* showImplicit */ ,
-                                          XkbFileAddOnFunc /* addOn */ ,
-                                          void *        /* priv */
-    );
-
-extern _X_EXPORT Bool XkbWriteXKBKeyTypes(FILE * /* file */ ,
-                                          XkbDescPtr /* result */ ,
-                                          Bool /* topLevel */ ,
-                                          Bool /* showImplicit */ ,
-                                          XkbFileAddOnFunc /* addOn */ ,
-                                          void *        /* priv */
-    );
-
-extern _X_EXPORT Bool XkbWriteXKBCompatMap(FILE * /* file */ ,
-                                           XkbDescPtr /* result */ ,
-                                           Bool /* topLevel */ ,
-                                           Bool /* showImplicit */ ,
-                                           XkbFileAddOnFunc /* addOn */ ,
-                                           void *       /* priv */
-    );
-
-extern _X_EXPORT Bool XkbWriteXKBSymbols(FILE * /* file */ ,
-                                         XkbDescPtr /* result */ ,
-                                         Bool /* topLevel */ ,
-                                         Bool /* showImplicit */ ,
-                                         XkbFileAddOnFunc /* addOn */ ,
-                                         void * /* priv */
-    );
-
-extern _X_EXPORT Bool XkbWriteXKBGeometry(FILE * /* file */ ,
-                                          XkbDescPtr /* result */ ,
-                                          Bool /* topLevel */ ,
-                                          Bool /* showImplicit */ ,
-                                          XkbFileAddOnFunc /* addOn */ ,
-                                          void *        /* priv */
-    );
-
-/***====================================================================***/
-
 extern _X_EXPORT unsigned XkmReadFile(FILE * /* file */ ,
                                       unsigned /* need */ ,
                                       unsigned /* want */ ,
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index c09c11b1a..2ec3b85ed 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -37,6 +37,7 @@
 #include <X11/Xproto.h>
 
 #include "xkb/xkbfmisc_priv.h"
+#include "xkb/xkbout_priv.h"
 
 #include "misc.h"
 #include "inputstr.h"
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index 1fd45e7af..e1b97a56f 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -36,6 +36,7 @@
 #include <X11/extensions/XKMformat.h>
 
 #include "xkb/xkbfmisc_priv.h"
+#include "xkb/xkbout_priv.h"
 #include "xkb/xkbtext_priv.h"
 
 #include "misc.h"
diff --git a/xkb/xkbout_priv.h b/xkb/xkbout_priv.h
new file mode 100644
index 000000000..790a009ec
--- /dev/null
+++ b/xkb/xkbout_priv.h
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_XKB_XKBFOUT_PRIV_H
+#define _XSERVER_XKB_XKBFOUT_PRIV_H
+
+#include <stdio.h>
+#include <X11/X.h>
+#include <X11/Xdefs.h>
+
+#include "xkbstr.h"
+
+typedef void (*XkbFileAddOnFunc) (FILE *file,
+                                  XkbDescPtr result,
+                                  Bool topLevel,
+                                  Bool showImplicit,
+                                  int fileSection,
+                                  void *priv);
+
+Bool XkbWriteXKBKeyTypes(FILE *file, XkbDescPtr result, Bool topLevel,
+                         Bool showImplicit, XkbFileAddOnFunc addOn, void *priv);
+Bool XkbWriteXKBKeycodes(FILE *file, XkbDescPtr result, Bool topLevel,
+                         Bool showImplicit, XkbFileAddOnFunc addOn, void *priv);
+Bool XkbWriteXKBCompatMap(FILE *file, XkbDescPtr result, Bool topLevel,
+                          Bool showImplicit, XkbFileAddOnFunc addOn, void *priv);
+Bool XkbWriteXKBSymbols(FILE *file, XkbDescPtr result, Bool topLevel,
+                        Bool showImplicit, XkbFileAddOnFunc addOn, void *priv);
+Bool XkbWriteXKBGeometry(FILE *file, XkbDescPtr result, Bool topLevel,
+                         Bool showImplicit, XkbFileAddOnFunc addOn, void *priv);
+
+#endif /* _XSERVER_XKB_XKBFOUT_PRIV_H */