From 06dbab958c026b920c6e00e0c78730427ec4b10f Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 22 May 2025 17:46:06 +0200
Subject: [PATCH] dix: unexport InitAtoms() and FreeAllAtoms()

Not used by any drivers, very DIX-internal, so should not be part
of public API.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/atom.c                 |  1 +
 dix/atom_priv.h            | 18 ++++++++++++++++++
 dix/main.c                 |  1 +
 include/dix.h              |  6 ------
 test/touch.c               |  1 +
 test/xi2/protocol-common.c |  1 +
 test/xtest.c               |  1 +
 7 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 dix/atom_priv.h

diff --git a/dix/atom.c b/dix/atom.c
index 86e946bc5..1e6524c92 100644
--- a/dix/atom.c
+++ b/dix/atom.c
@@ -51,6 +51,7 @@ SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xatom.h>
 
+#include "dix/atom_priv.h"
 #include "dix/dix_priv.h"
 
 #include "misc.h"
diff --git a/dix/atom_priv.h b/dix/atom_priv.h
new file mode 100644
index 000000000..c885cc2c7
--- /dev/null
+++ b/dix/atom_priv.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_DIX_ATOM_PRIV_H
+#define _XSERVER_DIX_ATOM_PRIV_H
+
+/*
+ * @brief initialize atom table
+ */
+void InitAtoms(void);
+
+/*
+ * @brief free all atoms and atom table
+ */
+void FreeAllAtoms(void);
+
+#endif /* _XSERVER_DIX_ATOM_PRIV_H */
diff --git a/dix/main.c b/dix/main.c
index 777b573ca..22682f4c4 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -85,6 +85,7 @@ Equipment Corporation.
 #include <X11/fonts/libxfont2.h>
 
 #include "config/hotplug_priv.h"
+#include "dix/atom_priv.h"
 #include "dix/callback_priv.h"
 #include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
diff --git a/include/dix.h b/include/dix.h
index 8981319a4..97c367b3b 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -202,12 +202,6 @@ extern _X_EXPORT Bool ValidAtom(Atom /*atom */ );
 
 extern _X_EXPORT const char *NameForAtom(Atom /*atom */ );
 
-extern _X_EXPORT void
-FreeAllAtoms(void);
-
-extern _X_EXPORT void
-InitAtoms(void);
-
 /* main.c */
 
 extern _X_EXPORT void
diff --git a/test/touch.c b/test/touch.c
index 3e9100a9f..cb706fec8 100644
--- a/test/touch.c
+++ b/test/touch.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 
+#include "dix/atom_priv.h"
 #include "dix/input_priv.h"
 
 #include "inputstr.h"
diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c
index 821b4b132..7b6ea1eb7 100644
--- a/test/xi2/protocol-common.c
+++ b/test/xi2/protocol-common.c
@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include <X11/extensions/XI2.h>
 
+#include "dix/atom_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/exevents_priv.h"
 
diff --git a/test/xtest.c b/test/xtest.c
index e1057b82c..6f7761739 100644
--- a/test/xtest.c
+++ b/test/xtest.c
@@ -29,6 +29,7 @@
 #include <stdint.h>
 #include <X11/Xatom.h>
 
+#include "dix/atom_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"