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

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

diff --git a/Xext/security.c b/Xext/security.c
index cf5f4051a..7d8aa7c71 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -28,6 +28,8 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include <X11/extensions/securproto.h>
+
 #include "dix/dix_priv.h"
 #include "dix/registry_priv.h"
 #include "os/audit.h"
@@ -41,10 +43,11 @@ in this Software without prior written authorization from The Open Group.
 #include "privates.h"
 #include "xacestr.h"
 #include "securitysrv.h"
-#include <X11/extensions/securproto.h>
-#include "extinit.h"
+#include "extinit_priv.h"
 #include "protocol-versions.h"
 
+Bool noSecurityExtension = FALSE;
+
 /* Extension stuff */
 static int SecurityErrorBase;   /* first Security error number */
 static int SecurityEventBase;   /* first Security event number */
diff --git a/include/extinit.h b/include/extinit.h
index 3622b0418..c8b5857b3 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 XCSECURITY
-extern _X_EXPORT Bool noSecurityExtension;
-#endif
-
 #ifdef XF86BIGFONT
 extern _X_EXPORT Bool noXFree86BigfontExtension;
 #endif
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index db9cdf52b..2f0c3f23b 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -18,6 +18,7 @@ extern Bool noRenderExtension;
 extern Bool noResExtension;
 extern Bool noRRExtension;
 extern Bool noScreenSaverExtension;
+extern Bool noSecurityExtension;
 extern Bool noShapeExtension;
 extern Bool noTestExtensions;
 
diff --git a/os/utils.c b/os/utils.c
index 7ee071084..dc99a243e 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -123,9 +123,6 @@ __stdcall unsigned long GetTickCount(void);
 #ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
 #endif
-#ifdef XCSECURITY
-Bool noSecurityExtension = FALSE;
-#endif
 #ifdef XF86BIGFONT
 Bool noXFree86BigfontExtension = FALSE;
 #endif