From c842dde3ef663cf8e25f393850faaa632fd9e892 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 28 Jun 2024 22:32:08 +0200
Subject: [PATCH] (submit/miext-extinit) composite: move noCompositeExtension
 into the extension code

This flag is better off in the extension code instead of the OS layer.

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

diff --git a/composite/compext.c b/composite/compext.c
index 9f6928262..68c60ac68 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -50,6 +50,8 @@
 #include "protocol-versions.h"
 #include "extinit_priv.h"
 
+Bool noCompositeExtension = FALSE;
+
 static CARD8 CompositeReqCode;
 static DevPrivateKeyRec CompositeClientPrivateKeyRec;
 
diff --git a/include/extinit.h b/include/extinit.h
index 8f29a430b..752f6f920 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -53,6 +53,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "extnsionst.h"
 
+/* required by: libglx */
 #ifdef COMPOSITE
 extern _X_EXPORT Bool noCompositeExtension;
 #endif
diff --git a/os/utils.c b/os/utils.c
index 457afc40b..a4d5beba1 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -121,9 +121,6 @@ __stdcall unsigned long GetTickCount(void);
 #include "dixstruct_priv.h"
 #include "dpmsproc.h"
 
-#ifdef COMPOSITE
-Bool noCompositeExtension = FALSE;
-#endif
 #ifdef XFreeXDGA
 Bool noXFree86DGAExtension = FALSE;
 #endif