From 2d3dd30a2ef26dc5106f9700f038bf3ea1fc901e Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 16 May 2025 10:36:21 +0200 Subject: [PATCH] (!1985) randr: unexport output 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 --- randr/randrstr.h | 26 -------------------------- randr/rrdispatch_priv.h | 11 +++++++++++ randr/rroutput.c | 1 + randr/rrproperty.c | 1 + 4 files changed, 13 insertions(+), 26 deletions(-) diff --git a/randr/randrstr.h b/randr/randrstr.h index f43b3406f..75c5a5605 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -773,15 +773,6 @@ extern _X_EXPORT void extern _X_EXPORT void RROutputDestroy(RROutputPtr output); -extern _X_EXPORT int - ProcRRGetOutputInfo(ClientPtr client); - -extern _X_EXPORT int - ProcRRSetOutputPrimary(ClientPtr client); - -extern _X_EXPORT int - ProcRRGetOutputPrimary(ClientPtr client); - /* * Initialize output type */ @@ -823,23 +814,6 @@ extern _X_EXPORT int RRConfigureOutputProperty(RROutputPtr output, Atom property, Bool pending, Bool range, Bool immutable, int num_values, const INT32 *values); -extern _X_EXPORT int - ProcRRChangeOutputProperty(ClientPtr client); - -extern _X_EXPORT int - ProcRRGetOutputProperty(ClientPtr client); - -extern _X_EXPORT int - ProcRRListOutputProperties(ClientPtr client); - -extern _X_EXPORT int - ProcRRQueryOutputProperty(ClientPtr client); - -extern _X_EXPORT int - ProcRRConfigureOutputProperty(ClientPtr client); - -extern _X_EXPORT int - ProcRRDeleteOutputProperty(ClientPtr client); /* rrprovider.c */ #define PRIME_SYNC_PROP "PRIME Synchronization" diff --git a/randr/rrdispatch_priv.h b/randr/rrdispatch_priv.h index 9e61eeafa..663997000 100644 --- a/randr/rrdispatch_priv.h +++ b/randr/rrdispatch_priv.h @@ -32,4 +32,15 @@ int ProcRRDestroyMode(ClientPtr client); int ProcRRAddOutputMode(ClientPtr client); int ProcRRDeleteOutputMode(ClientPtr client); +/* output related dispatch */ +int ProcRRGetOutputInfo(ClientPtr client); +int ProcRRSetOutputPrimary(ClientPtr client); +int ProcRRGetOutputPrimary(ClientPtr client); +int ProcRRChangeOutputProperty(ClientPtr client); +int ProcRRGetOutputProperty(ClientPtr client); +int ProcRRListOutputProperties(ClientPtr client); +int ProcRRQueryOutputProperty(ClientPtr client); +int ProcRRConfigureOutputProperty(ClientPtr client); +int ProcRRDeleteOutputProperty(ClientPtr client); + #endif /* _XSERVER_RANDR_RRDISPATCH_H */ diff --git a/randr/rroutput.c b/randr/rroutput.c index 8d0f05498..b2c7cf65b 100644 --- a/randr/rroutput.c +++ b/randr/rroutput.c @@ -26,6 +26,7 @@ #include "dix/dix_priv.h" #include "randr/randrstr_priv.h" +#include "randr/rrdispatch_priv.h" RESTYPE RROutputType; diff --git a/randr/rrproperty.c b/randr/rrproperty.c index 8df9790f1..2a4e33705 100644 --- a/randr/rrproperty.c +++ b/randr/rrproperty.c @@ -24,6 +24,7 @@ #include #include "dix/dix_priv.h" +#include "randr/rrdispatch_priv.h" #include "randrstr_priv.h" #include "propertyst.h"