From aa981da99238a2302f84d99544f87d08c0591b76 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 16 May 2025 10:09:18 +0200
Subject: [PATCH] randr: unexport screen related request handlers

Those aren't used by any drivers and never should so, thus no need to
keep them exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 randr/randrstr.h        | 21 ---------------------
 randr/rrdispatch.c      |  1 +
 randr/rrdispatch_priv.h | 20 ++++++++++++++++++++
 randr/rrscreen.c        |  1 +
 randr/rrsdispatch.c     |  4 +++-
 5 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 randr/rrdispatch_priv.h

diff --git a/randr/randrstr.h b/randr/randrstr.h
index b4aaee07f..a8dfe7372 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -498,27 +498,6 @@ RRScreenSizeSet(ScreenPtr pScreen,
 extern _X_EXPORT void
  RRSendConfigNotify(ScreenPtr pScreen);
 
-/*
- * screen dispatch
- */
-extern _X_EXPORT int
- ProcRRGetScreenSizeRange(ClientPtr client);
-
-extern _X_EXPORT int
- ProcRRSetScreenSize(ClientPtr client);
-
-extern _X_EXPORT int
- ProcRRGetScreenResources(ClientPtr client);
-
-extern _X_EXPORT int
- ProcRRGetScreenResourcesCurrent(ClientPtr client);
-
-extern _X_EXPORT int
- ProcRRSetScreenConfig(ClientPtr client);
-
-extern _X_EXPORT int
- ProcRRGetScreenInfo(ClientPtr client);
-
 /*
  * Deliver a ScreenNotify event
  */
diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c
index c51d510a7..3a552f15c 100644
--- a/randr/rrdispatch.c
+++ b/randr/rrdispatch.c
@@ -23,6 +23,7 @@
 
 #include "dix/dix_priv.h"
 #include "randr/randrstr_priv.h"
+#include "randr/rrdispatch_priv.h"
 #include "os/fmt.h"
 
 #include "protocol-versions.h"
diff --git a/randr/rrdispatch_priv.h b/randr/rrdispatch_priv.h
new file mode 100644
index 000000000..f679b2dc3
--- /dev/null
+++ b/randr/rrdispatch_priv.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ *
+ * @brief: prototypes for the individual request handlers
+ */
+#ifndef _XSERVER_RANDR_RRDISPATCH_H
+#define _XSERVER_RANDR_RRDISPATCH_H
+
+#include "include/dix.h"
+
+/* screen related dispatch */
+int ProcRRGetScreenSizeRange(ClientPtr client);
+int ProcRRSetScreenSize(ClientPtr client);
+int ProcRRGetScreenResources(ClientPtr client);
+int ProcRRGetScreenResourcesCurrent(ClientPtr client);
+int ProcRRSetScreenConfig(ClientPtr client);
+int ProcRRGetScreenInfo(ClientPtr client);
+
+#endif /* _XSERVER_RANDR_RRDISPATCH_H */
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index 184b30f32..b81edcc22 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -23,6 +23,7 @@
 
 #include "dix/dix_priv.h"
 #include "randr/randrstr_priv.h"
+#include "randr/rrdispatch_priv.h"
 
 static CARD16
  RR10CurrentSizeID(ScreenPtr pScreen);
diff --git a/randr/rrsdispatch.c b/randr/rrsdispatch.c
index c447c5d63..c163d6317 100644
--- a/randr/rrsdispatch.c
+++ b/randr/rrsdispatch.c
@@ -19,8 +19,10 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
-#include "randrstr_priv.h"
+#include "randr/randrstr_priv.h"
+#include "randr/rrdispatch_priv.h"
 
 static int _X_COLD
 SProcRRQueryVersion(ClientPtr client)