From e0e0c17a2f8c108f6db860d12e822f57b8aa948e Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 28 Jun 2024 22:52:57 +0200
Subject: [PATCH] (submit/miext-extinit) xfree86: dri: unexport
 noXFree86DRIExtension and move into extension

This isn't needed by any external module, so no need to export it.
And those flags are better off in the corresponding extension,
instead of the OS layer.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xfree86/common/xf86Extensions.h | 4 ++--
 hw/xfree86/dri/dri.c               | 2 ++
 os/utils.c                         | 3 ---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/hw/xfree86/common/xf86Extensions.h b/hw/xfree86/common/xf86Extensions.h
index cad86c881..7bebb1e12 100644
--- a/hw/xfree86/common/xf86Extensions.h
+++ b/hw/xfree86/common/xf86Extensions.h
@@ -29,8 +29,8 @@
 #include "extnsionst.h"
 
 #ifdef XF86DRI
-extern _X_EXPORT Bool noXFree86DRIExtension;
-extern void XFree86DRIExtensionInit(void);
+extern Bool noXFree86DRIExtension;
+void XFree86DRIExtensionInit(void);
 #endif
 
 #ifdef DRI2
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 78f8060ee..1b7f46681 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -74,6 +74,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86VGAarbiter.h"
 #include "xf86Extensions.h"
 
+Bool noXFree86DRIExtension = FALSE;
+
 static int DRIEntPrivIndex = -1;
 static DevPrivateKeyRec DRIScreenPrivKeyRec;
 
diff --git a/os/utils.c b/os/utils.c
index 5c49d64e2..0abe6807e 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -123,9 +123,6 @@ __stdcall unsigned long GetTickCount(void);
 #ifdef XFreeXDGA
 Bool noXFree86DGAExtension = FALSE;
 #endif
-#ifdef XF86DRI
-Bool noXFree86DRIExtension = FALSE;
-#endif
 #ifdef XF86VIDMODE
 Bool noXFree86VidModeExtension = FALSE;
 #endif