diff options
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/misc/ps_status.c | 2 | ||||
| -rw-r--r-- | src/test/regress/regress.c | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 00c46d40071..24aeffe929f 100644 --- a/meson.build +++ b/meson.build @@ -2150,7 +2150,6 @@ if cc.get_id() == 'msvc' # Warnings to disable: # from /W1: '/wd4090', # different 'modifier' qualifiers - '/wd4273', # inconsistent DLL linkage # from /W2: '/wd4244', # conversion from 'type1' to 'type2', possible loss of data # from /W3: diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 00de559ba8f..7c064cf9fbb 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -880,7 +880,7 @@ PostmasterMain(int argc, char *argv[]) /* For debugging: display postmaster environment */ if (message_level_is_interesting(DEBUG3)) { -#if !defined(WIN32) || defined(_MSC_VER) +#if !defined(WIN32) extern char **environ; #endif char **p; diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c index 4df25944deb..8709c4f5125 100644 --- a/src/backend/utils/misc/ps_status.c +++ b/src/backend/utils/misc/ps_status.c @@ -23,7 +23,7 @@ #include "utils/guc.h" #include "utils/ps_status.h" -#if !defined(WIN32) || defined(_MSC_VER) +#if !defined(WIN32) extern char **environ; #endif diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c index 465ac148ac9..a2db6080876 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -432,7 +432,7 @@ PG_FUNCTION_INFO_V1(get_environ); Datum get_environ(PG_FUNCTION_ARGS) { -#if !defined(WIN32) || defined(_MSC_VER) +#if !defined(WIN32) extern char **environ; #endif int nvals = 0; |