From cd38849000be06b6f5cf549ac8facf766b14a0b9 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 28 Jun 2024 23:05:48 +0200
Subject: [PATCH] (submit/miext-extinit) xfree86: dga: unexport
 noXFree86DGAExtension 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/xf86DGA.c        | 2 ++
 hw/xfree86/common/xf86Extensions.h | 6 +++---
 os/utils.c                         | 3 ---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index c7f230feea..e7bca90d19 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -78,6 +78,8 @@
 #include "dgaproc.h"
 #include "protocol-versions.h"
 
+Bool noXFree86DGAExtension = FALSE;
+
 #define DGA_PROTOCOL_OLD_SUPPORT 1
 
 static DevPrivateKeyRec DGAScreenKeyRec;
diff --git a/hw/xfree86/common/xf86Extensions.h b/hw/xfree86/common/xf86Extensions.h
index 735a9e6ea4..6e9f8832d5 100644
--- a/hw/xfree86/common/xf86Extensions.h
+++ b/hw/xfree86/common/xf86Extensions.h
@@ -47,9 +47,9 @@ extern void XFree86VidModeExtensionInit(void);
 
 #ifdef XFreeXDGA
 #include <X11/extensions/xf86dgaproto.h>
-extern _X_EXPORT Bool noXFree86DGAExtension;
-extern void XFree86DGAExtensionInit(void);
-extern void XFree86DGARegister(void);
+extern Bool noXFree86DGAExtension;
+void XFree86DGAExtensionInit(void);
+void XFree86DGARegister(void);
 #endif
 
 #endif
diff --git a/os/utils.c b/os/utils.c
index ced0098d2b..9ac49aea54 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -120,9 +120,6 @@ __stdcall unsigned long GetTickCount(void);
 #include "dixstruct_priv.h"
 #include "dpmsproc.h"
 
-#ifdef XFreeXDGA
-Bool noXFree86DGAExtension = FALSE;
-#endif
 #ifdef XF86VIDMODE
 Bool noXFree86VidModeExtension = FALSE;
 #endif