From b0306631128d69edd7a5fa5f5df8ae1a76fe88f2 Mon Sep 17 00:00:00 2001 From: Tobias Stoeckmann Date: Wed, 3 Sep 2025 19:37:38 +0200 Subject: [PATCH] gmessages: Add static variables only if needed The static variables win32_keep_fatal_message and fatal_msg_buf are only used for Windows debug builds and those without G_WINAPI_ONLY_APP defined. These checks are already in place for consumer of fatal_msg_buf, so extend their usage. --- glib/gmessages.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glib/gmessages.c b/glib/gmessages.c index e2ca8fccc..5ceb9c684 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -432,7 +432,7 @@ _g_log_abort (gboolean breakpoint) g_abort (); } -#ifdef G_OS_WIN32 +#if defined(G_OS_WIN32) && (defined(_DEBUG) || !defined(G_WINAPI_ONLY_APP)) static gboolean win32_keep_fatal_message = FALSE; /* This default message will usually be overwritten. */ @@ -1109,7 +1109,7 @@ mklevel_prefix (gchar level_prefix[STRING_BUFFER_SIZE], if (log_level & ALERT_LEVELS) strcat (level_prefix, " **"); -#ifdef G_OS_WIN32 +#if defined(G_OS_WIN32) && (defined(_DEBUG) || !defined(G_WINAPI_ONLY_APP)) if ((log_level & G_LOG_FLAG_FATAL) != 0 && !g_test_initialized ()) win32_keep_fatal_message = TRUE; #endif