From 799d5e0aa0c511ba1cdb27502cfa7f19f22debdf Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 2 May 2024 18:32:57 +0200
Subject: [PATCH] (submit/miext-extinit) res: unexport noResExtension 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>
---
 Xext/xres.c            | 2 ++
 include/extinit.h      | 4 ----
 include/extinit_priv.h | 1 +
 os/utils.c             | 3 ---
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Xext/xres.c b/Xext/xres.c
index 1ce3ea7df..4ec4d4971 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -35,6 +35,8 @@
 #include "compint.h"
 #endif
 
+Bool noResExtension = FALSE;
+
 /** @brief Holds fragments of responses for ConstructClientIds.
  *
  *  note: there is no consideration for data alignment */
diff --git a/include/extinit.h b/include/extinit.h
index c1a63f62b..b234dc95e 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -62,10 +62,6 @@ extern _X_EXPORT Bool noCompositeExtension;
 extern _X_EXPORT Bool noPanoramiXExtension;
 #endif
 
-#if defined(RES)
-extern _X_EXPORT Bool noResExtension;
-#endif
-
 #if defined(SCREENSAVER)
 extern _X_EXPORT Bool noScreenSaverExtension;
 #endif
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index 0e9c35551..6d1928122 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -14,6 +14,7 @@ extern Bool noDPMSExtension;
 extern Bool noGEExtension;
 extern Bool noGlxExtension;
 extern Bool noRenderExtension;
+extern Bool noResExtension;
 extern Bool noRRExtension;
 extern Bool noTestExtensions;
 
diff --git a/os/utils.c b/os/utils.c
index d8212fbc2..afc638fe1 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -135,9 +135,6 @@ Bool noShapeExtension = FALSE;
 #ifdef XCSECURITY
 Bool noSecurityExtension = FALSE;
 #endif
-#ifdef RES
-Bool noResExtension = FALSE;
-#endif
 #ifdef XF86BIGFONT
 Bool noXFree86BigfontExtension = FALSE;
 #endif