NotificationsYou must be signed in to change notification settings
Fork5.3k
Star19.2k

Commit371d40c

committed

Backpatch: Fix warnings about declaration of environ on MinGW

Backpatch commit7bc9a8b to 13-17. The motivation for backpatching is thatwe want to update CI to Debian Trixie. Trixie contains a newer mingwinstallation, which would trigger the warning addressed by7bc9a8b. Therisk of backpatching seems fairly low, given that it did not cause issues inthe branches the commit is already present.While CI is not present in 13-14, it seems better to be consistent acrossbranches.Author: Thomas Munro <tmunro@postgresql.org>Discussion:https://postgr.es/m/o5yadhhmyjo53svzwvaocww6zkrp63i4f32cw3treuh46pxtza@hyqio5b2tkt6Backpatch-through: 13

1 parent2c56b70 commit371d40cCopy full SHA for 371d40c

File tree

3 files changed

-0

lines changed

src
- backend
  - postmaster
    - postmaster.c
  - utils/misc
    - ps_status.c
- test/regress
  - regress.c

3 files changed

-0

lines changed

`‎src/backend/postmaster/postmaster.c‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -947,7 +947,9 @@ PostmasterMain(int argc, char *argv[])`
`947`	`947`
`948`	`948`	`/* For debugging: display postmaster environment */`
`949`	`949`	`{`
	`950`	`+#if !defined(WIN32)\|\| defined(_MSC_VER)`
`950`	`951`	`externchar**environ;`
	`952`	`+#endif`
`951`	`953`	`char**p;`
`952`	`954`
`953`	`955`	`ereport(DEBUG3,`

`‎src/backend/utils/misc/ps_status.c‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,9 @@`
`32`	`32`	`#include"utils/guc.h"`
`33`	`33`	`#include"utils/ps_status.h"`
`34`	`34`
	`35`	`+#if !defined(WIN32)\|\| defined(_MSC_VER)`
`35`	`36`	`externchar**environ;`
	`37`	`+#endif`
`36`	`38`	`boolupdate_process_title= true;`
`37`	`39`
`38`	`40`

`‎src/test/regress/regress.c‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,9 @@ PG_FUNCTION_INFO_V1(get_environ);`
`634`	`634`	`Datum`
`635`	`635`	`get_environ(PG_FUNCTION_ARGS)`
`636`	`636`	`{`
	`637`	`+#if !defined(WIN32)\|\| defined(_MSC_VER)`
`637`	`638`	`externchar**environ;`
	`639`	`+#endif`
`638`	`640`	`intnvals=0;`
`639`	`641`	`ArrayType*result;`
`640`	`642`	`Datum*env;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit371d40c

File tree

3 files changed

3 files changed

`‎src/backend/postmaster/postmaster.c‎`

`‎src/backend/utils/misc/ps_status.c‎`

`‎src/test/regress/regress.c‎`

0 commit comments