From 75b86bab2f64f5fbc55e1d00d9f98a0b5dba6698 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 2 May 2024 16:56:26 +0200
Subject: [PATCH] (submit/miext-extinit) dbe: unexport noDbeExtension field

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>
---
 dbe/dbe.c              | 1 +
 include/extinit.h      | 5 -----
 include/extinit_priv.h | 1 +
 os/utils.c             | 3 ---
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dbe/dbe.c b/dbe/dbe.c
index 40ddd5a9b..9aa290ffc 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -51,6 +51,7 @@
 #include "xace.h"
 
 /* GLOBALS */
+Bool noDbeExtension = FALSE;
 
 /* These are globals for use by DDX */
 DevPrivateKeyRec dbeScreenPrivKeyRec;
diff --git a/include/extinit.h b/include/extinit.h
index d68516196..4b62d6f48 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -56,11 +56,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef COMPOSITE
 extern _X_EXPORT Bool noCompositeExtension;
 #endif
-
-#if defined(DBE)
-extern _X_EXPORT Bool noDbeExtension;
-#endif
-
 #if defined(DPMSExtension)
 extern _X_EXPORT Bool noDPMSExtension;
 #endif
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index 2f0c8b31a..d10ce79f2 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -9,6 +9,7 @@
 #include "extinit.h"
 
 extern Bool noDamageExtension;
+extern Bool noDbeExtension;
 extern Bool noGEExtension;
 
 void CompositeExtensionInit(void);
diff --git a/os/utils.c b/os/utils.c
index ddf5e4651..296f64cf1 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -123,9 +123,6 @@ Bool noTestExtensions;
 #ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
 #endif
-#ifdef DBE
-Bool noDbeExtension = FALSE;
-#endif
 #ifdef DPMSExtension
 #include "dpmsproc.h"
 Bool noDPMSExtension = FALSE;