From f232ee90421cb223cd2b2eaffc1a5d6228f97aab Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 28 Jun 2024 19:39:21 +0200
Subject: [PATCH] (submit/miext-extinit) Xext: xf86bigfont: unexport
 noXFree86BigfontExtension

This field isn't used by any drivers, and also better belongs into
the corresponding extension instead of OS adaption layer.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xext/xf86bigfont.c     | 4 +++-
 include/extinit.h      | 4 ----
 include/extinit_priv.h | 1 +
 os/utils.c             | 3 ---
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index e18d4f648..9d711dba5 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -66,11 +66,13 @@
 #include "gcstruct.h"
 #include "dixfontstr.h"
 #include "extnsionst.h"
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "protocol-versions.h"
 
 #include "xf86bigfontsrv.h"
 
+Bool noXFree86BigfontExtension = FALSE;
+
 static void XF86BigfontResetProc(ExtensionEntry *extEntry );
 
 #ifdef MITSHM
diff --git a/include/extinit.h b/include/extinit.h
index c8b5857b3..3825f43a7 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -62,10 +62,6 @@ extern _X_EXPORT Bool noCompositeExtension;
 extern _X_EXPORT Bool noPanoramiXExtension;
 #endif
 
-#ifdef XF86BIGFONT
-extern _X_EXPORT Bool noXFree86BigfontExtension;
-#endif
-
 extern _X_EXPORT Bool noXFixesExtension;
 
 #if defined(XSELINUX)
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index 2f0c3f23b..d5b099701 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -21,6 +21,7 @@ extern Bool noScreenSaverExtension;
 extern Bool noSecurityExtension;
 extern Bool noShapeExtension;
 extern Bool noTestExtensions;
+extern Bool noXFree86BigfontExtension;
 
 void CompositeExtensionInit(void);
 void DamageExtensionInit(void);
diff --git a/os/utils.c b/os/utils.c
index a17b3e7c0..059d81eb4 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -125,9 +125,6 @@ __stdcall unsigned long GetTickCount(void);
 #ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
 #endif
-#ifdef XF86BIGFONT
-Bool noXFree86BigfontExtension = FALSE;
-#endif
 #ifdef XFreeXDGA
 Bool noXFree86DGAExtension = FALSE;
 #endif