From 9986e17950bb8e369937ca169f4f6a3df39baf9b Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 25 Jul 2025 14:04:07 +0200
Subject: [PATCH] meson: move MAXCLIENTS and LIMITCLIENTS into dix-config.h

Both are potentially tunable variables, and MAXCLIENTS is (still) used by
intel-driver, but also by os specific parts that must not include misc.h

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xfree86/common/xf86Config.c | 2 +-
 include/meson.build            | 6 ++++++
 include/misc.h                 | 1 -
 include/xorg-server.h.meson.in | 3 +++
 os/osdep.h                     | 2 --
 os/osinit.c                    | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index cbb0099a68..309828ba6e 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -957,7 +957,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
 #endif
 
     from = X_DEFAULT;
-    if (LimitClients != LIMITCLIENTS)
+    if (LimitClients != DIX_LIMITCLIENTS)
 	from = X_CMDLINE;
     i = -1;
     if (xf86GetOptValInteger(FlagOptions, FLAG_MAX_CLIENTS, &i)) {
diff --git a/include/meson.build b/include/meson.build
index b50ec56ce2..fca546f250 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -204,6 +204,12 @@ conf_data.set('TCPCONN', '1')
 conf_data.set('UNIXCONN', host_machine.system() != 'windows' ? '1' : false)
 conf_data.set('IPv6', build_ipv6 ? '1' : false)
 
+# potentially tunable - needed also in places that cannot include misc.h
+conf_data.set('MAXCLIENTS', 2048)
+
+# Must be a power of 2 and <= MAXCLIENTS */
+conf_data.set('DIX_LIMITCLIENTS', 256)
+
 # some drivers (eg. xf86-video-intel) still relying on this symbol being set
 conf_data.set('COMPOSITE', '1')
 
diff --git a/include/misc.h b/include/misc.h
index f5784fa182..79b0817c37 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -87,7 +87,6 @@ OF THIS SOFTWARE.
 #ifndef MAXGPUSCREENS
 #define MAXGPUSCREENS	16
 #endif
-#define MAXCLIENTS	2048
 #define MAXFORMATS	8
 #ifndef MAXDEVICES
 #define MAXDEVICES	256      /* input devices */
diff --git a/include/xorg-server.h.meson.in b/include/xorg-server.h.meson.in
index 1d3096c3c5..772b7af3c1 100644
--- a/include/xorg-server.h.meson.in
+++ b/include/xorg-server.h.meson.in
@@ -205,6 +205,9 @@
 /* byte order */
 #mesondefine X_BYTE_ORDER
 
+/* maximum number of clients */
+#mesondefine MAXCLIENTS
+
 /* announce server API features */
 #define XORG_API_DIX_SCREEN_HOOK_WINDOW_DESTROY 1
 #define XORG_API_DIX_SCREEN_HOOK_WINDOW_POSITION 1
diff --git a/os/osdep.h b/os/osdep.h
index a7dc13cf3a..f3e08d20e8 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -216,8 +216,6 @@ Ones(unsigned long mask)
 }
 #endif
 
-#define LIMITCLIENTS     256     /* Must be a power of 2 and <= MAXCLIENTS */
-
 /* static assert for protocol structure sizes */
 #ifndef __size_assert
 #define __size_assert(what, howmuch) \
diff --git a/os/osinit.c b/os/osinit.c
index 3722bc4492..3e02f91eea 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -75,7 +75,7 @@ SOFTWARE.
 #endif
 
 /* The actual user defined max number of clients */
-int LimitClients = LIMITCLIENTS;
+int LimitClients = DIX_LIMITCLIENTS;
 
 static OsSigWrapperPtr OsSigWrapper = NULL;