From 33a11228cfe80ea4f4bccfebc8ae9d17cf9592ae Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun, 15 Jun 2025 12:22:05 -0700
Subject: [PATCH] Revert "include: unexport no*Extension flags"

This reverts commit e3cbde9914f969b99197704785b4253c7e29faa4.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2022>
---
 hw/xnest/Args.c               |  1 -
 hw/xwayland/xwayland-screen.c |  1 -
 include/extinit.h             | 50 +++++++++++++++++++++++++++++++++++
 include/extinit_priv.h        | 16 -----------
 include/globals.h             |  1 +
 os/utils.c                    |  1 -
 6 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index dbaf3a7e5..aa87558f3 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -17,7 +17,6 @@ is" without express or implied warranty.
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 
-#include "include/extinit_priv.h"
 #include "os/ddx_priv.h"
 
 #include "screenint.h"
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 308879213..7c8d802d0 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -43,7 +43,6 @@
 #include "os/osdep.h"
 #include "os/xserver_poll.h"
 
-#include "extinit_priv.h"
 #include <micmap.h>
 #include <misyncshm.h>
 #include <os.h>
diff --git a/include/extinit.h b/include/extinit.h
index 937f71e0e..1ad7cf1c3 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -57,10 +57,60 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 extern _X_EXPORT Bool noCompositeExtension;
 #endif
 
+#ifdef DAMAGE
+extern _X_EXPORT Bool noDamageExtension;
+#endif
+
+#if defined(DBE)
+extern _X_EXPORT Bool noDbeExtension;
+#endif
+
+#if defined(DPMSExtension)
+extern _X_EXPORT Bool noDPMSExtension;
+#endif
+
+#ifdef GLXEXT
+extern _X_EXPORT Bool noGlxExtension;
+#endif
+
 #ifdef XINERAMA
 extern _X_EXPORT Bool noPanoramiXExtension;
 #endif /* XINERAMA */
 
+#ifdef RANDR
+extern _X_EXPORT Bool noRRExtension;
+#endif
+
+extern _X_EXPORT Bool noRenderExtension;
+
+#if defined(RES)
+extern _X_EXPORT Bool noResExtension;
+#endif
+
+#if defined(SCREENSAVER)
+extern _X_EXPORT Bool noScreenSaverExtension;
+#endif
+
+extern _X_EXPORT Bool noShapeExtension;
+
+#ifdef MITSHM
+extern _X_EXPORT Bool noMITShmExtension;
+#endif
+
+#ifdef XCSECURITY
+extern _X_EXPORT Bool noSecurityExtension;
+#endif
+
+#ifdef XF86BIGFONT
+extern _X_EXPORT Bool noXFree86BigfontExtension;
+#endif
+
+extern _X_EXPORT Bool noXFixesExtension;
+
+#if defined(XSELINUX)
+extern _X_EXPORT Bool noSELinuxExtension;
+#endif
+
 #if defined(XV)
 extern _X_EXPORT Bool noXvExtension;
 #endif
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index 71e7f295d..3b150f6d7 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -8,22 +8,6 @@
 
 #include "extinit.h"
 
-extern Bool noDamageExtension;
-extern Bool noDbeExtension;
-extern Bool noDPMSExtension;
-extern Bool noGlxExtension;
-extern Bool noMITShmExtension;
-extern Bool noRenderExtension;
-extern Bool noResExtension;
-extern Bool noRRExtension;
-extern Bool noScreenSaverExtension;
-extern Bool noSecurityExtension;
-extern Bool noSELinuxExtension;
-extern Bool noShapeExtension;
-extern Bool noTestExtensions;
-extern Bool noXFixesExtension;
-extern Bool noXFree86BigfontExtension;
-
 void CompositeExtensionInit(void);
 void DamageExtensionInit(void);
 void DbeExtensionInit(void);
diff --git a/include/globals.h b/include/globals.h
index 65a25855e..1ce5e8d39 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -25,6 +25,7 @@ extern _X_EXPORT int monitorResolution;
 extern _X_EXPORT int defaultColorVisualClass;
 
 extern _X_EXPORT int GrabInProgress;
+extern _X_EXPORT Bool noTestExtensions;
 extern _X_EXPORT char *SeatId;
 extern _X_EXPORT char *ConnectionInfo;
 extern _X_EXPORT sig_atomic_t inSignalContext;
diff --git a/os/utils.c b/os/utils.c
index e4e58fe1a..9b8d31370 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -119,7 +119,6 @@ __stdcall unsigned long GetTickCount(void);
 #include "present.h"
 #include "dixstruct_priv.h"
 #include "dpmsproc.h"
-#include "extinit_priv.h"
 
 #define X_INCLUDE_NETDB_H
 #include <X11/Xos_r.h>