From 19921fd401339a54497b4da4364f0cb5595683d9 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 23 Sep 2025 18:50:21 +0200
Subject: [PATCH] dix: unexport ConnectionInfo field

Not used by any drivers, so no need to keep it in public SDK.
Since it's not used by any drivers, effectively no ABI change, so
can be safely done within ABI-25.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xext/panoramiX.c      | 1 +
 Xext/panoramiXprocs.c | 1 +
 dix/main.c            | 1 +
 dix/server_priv.h     | 2 ++
 include/globals.h     | 1 -
 randr/rrscreen.c      | 1 +
 render/render.c       | 1 +
 7 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index b4c31157c2..6bba23a025 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -37,6 +37,7 @@ Equipment Corporation.
 #include "dix/rpcbuf_priv.h"
 #include "dix/screen_hooks_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/server_priv.h"
 #include "miext/extinit_priv.h"
 #include "Xext/panoramiX.h"
 #include "Xext/panoramiXsrv.h"
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 3cbbefda4d..246a21ccc1 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -35,6 +35,7 @@ Equipment Corporation.
 #include "dix/request_priv.h"
 #include "dix/rpcbuf_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/server_priv.h"
 #include "os/osdep.h"
 #include "Xext/panoramiX.h"
 #include "Xext/panoramiXsrv.h"
diff --git a/dix/main.c b/dix/main.c
index cebdba03c7..77882793fa 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -94,6 +94,7 @@ Equipment Corporation.
 #include "dix/registry_priv.h"
 #include "dix/screensaver_priv.h"
 #include "dix/selection_priv.h"
+#include "dix/server_priv.h"
 #include "os/audit_priv.h"
 #include "os/auth.h"
 #include "os/client_priv.h"
diff --git a/dix/server_priv.h b/dix/server_priv.h
index 2060d48bd1..d79cdf4729 100644
--- a/dix/server_priv.h
+++ b/dix/server_priv.h
@@ -23,4 +23,6 @@ static inline int dixCallServerAccessCallback(ClientPtr client, Mask access_mode
     return rec.status;
 }
 
+extern char *ConnectionInfo;
+
 #endif /* _XSERVER_DIX_SERVER_PRIV_H */
diff --git a/include/globals.h b/include/globals.h
index e1bdf1e2d1..5930212d31 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -17,7 +17,6 @@ extern _X_EXPORT int defaultColorVisualClass;
 
 extern _X_EXPORT int GrabInProgress;
 extern _X_EXPORT char *SeatId;
-extern _X_EXPORT char *ConnectionInfo;
 
 #ifdef XINERAMA
 extern _X_EXPORT Bool PanoramiXExtensionDisabledHack;
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index 2b2b3b70c8..168e4c6bf8 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -23,6 +23,7 @@
 
 #include "dix/dix_priv.h"
 #include "dix/request_priv.h"
+#include "dix/server_priv.h"
 #include "randr/randrstr_priv.h"
 #include "randr/rrdispatch_priv.h"
 
diff --git a/render/render.c b/render/render.c
index 70a6b6cbd8..f007ef94ab 100644
--- a/render/render.c
+++ b/render/render.c
@@ -36,6 +36,7 @@
 #include "dix/dix_priv.h"
 #include "dix/request_priv.h"
 #include "dix/screenint_priv.h"
+#include "dix/server_priv.h"
 #include "miext/extinit_priv.h"
 #include "os/osdep.h"
 #include "Xext/panoramiX.h"