From e923310d2f0b5df3bab9b5ee0be19e41621fb9ea Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed, 16 Jul 2025 17:14:21 -0700
Subject: [PATCH] Revert "dix: unexport MakePredeclaredAtoms()"

This reverts commit b3ec0bf58a1cbf32405e3421855929bd65a42390.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2048>
---
 dix/atom.c         | 7 ++-----
 dix/dix_priv.h     | 3 ---
 dix/generate-atoms | 3 ---
 include/misc.h     | 2 ++
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/dix/atom.c b/dix/atom.c
index 194b2baec..f0e6e2dc8 100644
--- a/dix/atom.c
+++ b/dix/atom.c
@@ -46,13 +46,10 @@ SOFTWARE.
 
 #include <dix-config.h>
 
-#include <stdio.h>
-#include <string.h>
 #include <X11/X.h>
 #include <X11/Xatom.h>
-
-#include "dix/dix_priv.h"
-
+#include <stdio.h>
+#include <string.h>
 #include "misc.h"
 #include "resource.h"
 #include "dix.h"
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 47c18817f..ec2ff44be 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -252,7 +252,4 @@ extern Bool explicit_display;
 extern Bool disableBackingStore;
 extern Bool enableBackingStore;
 
-/* in generated BuiltInAtoms.c */
-void MakePredeclaredAtoms(void);
-
 #endif /* _XSERVER_DIX_PRIV_H */
diff --git a/dix/generate-atoms b/dix/generate-atoms
index 780548919..86b1477a7 100755
--- a/dix/generate-atoms
+++ b/dix/generate-atoms
@@ -25,9 +25,6 @@ cat > "$OUTPUT" << __END__
 
 #include <X11/X.h>
 #include <X11/Xatom.h>
-
-#include "dix/dix_priv.h"
-
 #include "misc.h"
 #include "dix.h"
 void
diff --git a/include/misc.h b/include/misc.h
index ba179ff87..842d2d9c1 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -354,6 +354,8 @@ extern _X_EXPORT void SwapLongs(CARD32 *list, unsigned long count);
 
 extern _X_EXPORT void SwapShorts(short *list, unsigned long count);
 
+extern _X_EXPORT void MakePredeclaredAtoms(void);
+
 typedef struct _xPoint *DDXPointPtr;
 typedef struct pixman_box16 *BoxPtr;
 typedef struct _xEvent *xEventPtr;