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

diff --git a/include/extinit.h b/include/extinit.h
index e08d67e9b..edefff84c 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 RANDR
-extern _X_EXPORT Bool noRRExtension;
-#endif
-
 extern _X_EXPORT Bool noRenderExtension;
 
 #if defined(RES)
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index 0d5553c46..15592b2a4 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -13,6 +13,7 @@ extern Bool noDbeExtension;
 extern Bool noDPMSExtension;
 extern Bool noGEExtension;
 extern Bool noGlxExtension;
+extern Bool noRRExtension;
 extern Bool noTestExtensions;
 
 void CompositeExtensionInit(void);
diff --git a/os/utils.c b/os/utils.c
index 66815c5b1..dd55e7a6f 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -130,9 +130,6 @@ Bool noScreenSaverExtension = FALSE;
 #ifdef MITSHM
 Bool noMITShmExtension = FALSE;
 #endif
-#ifdef RANDR
-Bool noRRExtension = FALSE;
-#endif
 Bool noRenderExtension = FALSE;
 Bool noShapeExtension = FALSE;
 
diff --git a/randr/randr.c b/randr/randr.c
index 3cb4cbd39..6fbe5d3b7 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -38,6 +38,8 @@
 #define SubPixelUnknown 0
 #endif
 
+Bool noRRExtension = FALSE;
+
 #define RR_VALIDATE
 static int RRNScreens;