From d7aeb03d2418f3c01b125218f62af41ffad1aacf Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Tue, 4 Nov 2025 13:24:59 -0500 Subject: [PATCH] Backpatch: Fix warnings about declaration of environ on MinGW Backpatch commit 7bc9a8bdd2d to 13-17. The motivation for backpatching is that we want to update CI to Debian Trixie. Trixie contains a newer mingw installation, which would trigger the warning addressed by 7bc9a8bdd2d. The risk of backpatching seems fairly low, given that it did not cause issues in the branches the commit is already present. While CI is not present in 13-14, it seems better to be consistent across branches. Author: Thomas Munro Discussion: https://postgr.es/m/o5yadhhmyjo53svzwvaocww6zkrp63i4f32cw3treuh46pxtza@hyqio5b2tkt6 Backpatch-through: 13 --- src/backend/postmaster/postmaster.c | 2 ++ src/backend/utils/misc/ps_status.c | 2 ++ src/test/regress/regress.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 242b44eafc3..fa7b7add93a 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -942,7 +942,9 @@ PostmasterMain(int argc, char *argv[]) /* For debugging: display postmaster environment */ { +#if !defined(WIN32) || defined(_MSC_VER) extern char **environ; +#endif char **p; ereport(DEBUG3, diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c index 3a5c002d5de..3b231779352 100644 --- a/src/backend/utils/misc/ps_status.c +++ b/src/backend/utils/misc/ps_status.c @@ -32,7 +32,9 @@ #include "utils/guc.h" #include "utils/ps_status.h" +#if !defined(WIN32) || defined(_MSC_VER) extern char **environ; +#endif bool update_process_title = true; diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c index 481588c9a44..ed75c410ffe 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -631,7 +631,9 @@ PG_FUNCTION_INFO_V1(get_environ); Datum get_environ(PG_FUNCTION_ARGS) { +#if !defined(WIN32) || defined(_MSC_VER) extern char **environ; +#endif int nvals = 0; ArrayType *result; Datum *env; -- 2.47.3