From 6d821c90603799bf36f4a8fb4fb44ee2c74ac486 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 20 Oct 2026 19:02:29 +0300 Subject: [PATCH 43/43] client_start_server(): Use macros instead of const variables Fixes gnu-folding-constant warning See RM #2381 Signed-off-by: Marko Lindqvist --- client/connectdlg_common.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/client/connectdlg_common.c b/client/connectdlg_common.c index 284ac55c43..08ba99f69c 100644 --- a/client/connectdlg_common.c +++ b/client/connectdlg_common.c @@ -298,8 +298,8 @@ bool client_start_server(void) #ifdef HAVE_USABLE_FORK { int argc = 0; - const int max_nargs = 25; - char *argv[max_nargs + 1]; +#define MAX_NARGS 25 + char *argv[MAX_NARGS + 1]; char port_buf[32]; char dbg_lvl_buf[32]; /* Do not move this inside the block where it gets filled, * it's needed via the argv[x] pointer later on, so must @@ -353,7 +353,8 @@ bool client_start_server(void) argv[argc++] = ruleset; } argv[argc] = NULL; - fc_assert(argc <= max_nargs); + + fc_assert(argc <= MAX_NARGS); { struct astring srv_cmdline_opts = ASTRING_INIT; @@ -443,6 +444,8 @@ bool client_start_server(void) _exit(1); } } +#undef MAX_NARGS + #else /* HAVE_USABLE_FORK */ #ifdef FREECIV_MSWINDOWS if (logfile) { -- 2.53.0