From b1690c9c655482c4b3d025298aa1d2b1c35f60d0 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 28 Jun 2024 22:58:02 +0200
Subject: [PATCH] (submit/miext-extinit) xfree86: dri2: unexport
 noXFree86DRI2Extension 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/dri2/dri2ext.c          | 1 +
 os/utils.c                         | 3 ---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/hw/xfree86/common/xf86Extensions.h b/hw/xfree86/common/xf86Extensions.h
index 7bebb1e12..735a9e6ea 100644
--- a/hw/xfree86/common/xf86Extensions.h
+++ b/hw/xfree86/common/xf86Extensions.h
@@ -35,8 +35,8 @@ void XFree86DRIExtensionInit(void);
 
 #ifdef DRI2
 #include <X11/extensions/dri2proto.h>
-extern _X_EXPORT Bool noDRI2Extension;
-extern void DRI2ExtensionInit(void);
+extern Bool noDRI2Extension;
+void DRI2ExtensionInit(void);
 #endif
 
 #ifdef XF86VIDMODE
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index bb72eacbe..6a879a958 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -56,6 +56,7 @@
 
 static int DRI2EventBase;
 
+Bool noDRI2Extension = FALSE;
 
 static Bool
 validDrawable(ClientPtr client, XID drawable, Mask access_mode,
diff --git a/os/utils.c b/os/utils.c
index b81bc20b4..4b085c8bc 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -128,9 +128,6 @@ Bool noXFree86DGAExtension = FALSE;
 #ifdef XF86VIDMODE
 Bool noXFree86VidModeExtension = FALSE;
 #endif
-#ifdef DRI2
-Bool noDRI2Extension = FALSE;
-#endif
 
 Bool noGEExtension = FALSE;