From 36e2cf64c849f80d68f4c1fb40380d95d12209c4 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 29 Feb 2024 20:24:17 +0100
Subject: [PATCH] dix: unexport registry setup/teardown functions

these aren't to be called by modules, thus no need to export them.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1348>
---
 dix/main.c          |  3 +++
 dix/registry.c      |  3 +++
 dix/registry_priv.h | 15 +++++++++++++++
 include/registry.h  |  7 -------
 4 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 dix/registry_priv.h

diff --git a/dix/main.c b/dix/main.c
index 5964120c6..74da47b35 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -82,6 +82,9 @@ Equipment Corporation.
 #include <X11/Xos.h>            /* for unistd.h  */
 #include <X11/Xproto.h>
 #include <pixman.h>
+
+#include "dix/registry_priv.h"
+
 #include "scrnintstr.h"
 #include "misc.h"
 #include "os.h"
diff --git a/dix/registry.c b/dix/registry.c
index 84d48b4e3..0cee10789 100644
--- a/dix/registry.c
+++ b/dix/registry.c
@@ -25,6 +25,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <string.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "dix/registry_priv.h"
+
 #include "resource.h"
 #include "registry.h"
 
diff --git a/dix/registry_priv.h b/dix/registry_priv.h
new file mode 100644
index 000000000..17f05b88d
--- /dev/null
+++ b/dix/registry_priv.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_DIX_REGISTRY_H
+#define _XSERVER_DIX_REGISTRY_H
+
+/*
+ * Setup and teardown
+ */
+void dixResetRegistry(void);
+void dixFreeRegistry(void);
+void dixCloseRegistry(void);
+
+#endif /* _XSERVER_DIX_REGISTRY_H */
diff --git a/include/registry.h b/include/registry.h
index 867a55d3f..ba447b6a2 100644
--- a/include/registry.h
+++ b/include/registry.h
@@ -40,11 +40,4 @@ extern _X_EXPORT const char *LookupEventName(int event);
 extern _X_EXPORT const char *LookupErrorName(int error);
 #endif
 
-/*
- * Setup and teardown
- */
-extern _X_EXPORT void dixResetRegistry(void);
-extern _X_EXPORT void dixFreeRegistry(void);
-extern _X_EXPORT void dixCloseRegistry(void);
-
 #endif                          /* DIX_REGISTRY_H */