From 1e1f73938b9ef43cd3ec93d07e48353526470cf1 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" 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 --- 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 42a459df3..8a561f2b7 100644 --- a/dbe/dbe.c +++ b/dbe/dbe.c @@ -53,6 +53,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 f433c9337..9a965995b 100644 --- a/os/utils.c +++ b/os/utils.c @@ -124,9 +124,6 @@ Bool noTestExtensions; #ifdef COMPOSITE Bool noCompositeExtension = FALSE; #endif -#ifdef DBE -Bool noDbeExtension = FALSE; -#endif #ifdef DPMSExtension #include "dpmsproc.h" Bool noDPMSExtension = FALSE;