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 <tmunro@postgresql.org>
Discussion: https://postgr.es/m/o5yadhhmyjo53svzwvaocww6zkrp63i4f32cw3treuh46pxtza@hyqio5b2tkt6
Backpatch-through: 13

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 0b13e76568e24a49074e9bc64e1b58a182267d29..8a748f9d9c1b98a101414153110e26a692fd237c 100644 (file)
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -972,7 +972,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 d98993be4570d929dbe8bb1f679b96269ce864b5..5ff24698fc04bdf20ec21a9a31afb4347e42449a 100644 (file)
--- 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 5c0ecbace42a2bd5cea230acaf3998b6d4fecd84..580fddf2cec0b88f73246e588f0273e75942625d 100644 (file)
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -644,7 +644,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;