postgres.git / summary / log / commit / refs

commit    00bdbaca6056bca183d823873484f3e64d463f69
Author:   Andres Freund <andres@anarazel.de>
Date:     Tue Nov 04 18:24:58 2025 +0000
First released in: 13.23, 14.20, 15.15, 16.11, 17.7

    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


 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 0b13e76568e..8a748f9d9c1 100644
--- 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 d98993be457..5ff24698fc0 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 5c0ecbace42..580fddf2cec 100644
--- 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;


[parent: 42fa4dba8439]