summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Paquier <michael@paquier.xyz>2021-06-08 13:40:10 +0900
committerMichael Paquier <michael@paquier.xyz>2021-06-08 13:40:10 +0900
commitb7684bd105657813e9366f8d664c22bcfb0e9f42 (patch)
tree405ea89e512433b360f05d3d24ab6d4e2fc2be1d /src
parent9ddd1c27ee27e6d06349e4dc84baf14333d23311 (diff)
Remove unnecessary declaration in win32_port.h
Mis-merge introduced by e2f21ff, where pgwin32_setenv() was listed but not defined in win32env.c. This had no consequences as this routine does not exist in this branch. Only REL_12_STABLE and REL_13_STABLE got that wrong. Backpatch-through: 12
Diffstat (limited to 'src')
-rw-r--r--src/include/pg_config.h.win322
-rw-r--r--src/include/port/win32_port.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index e4590cf2e5a..9a1baa4e505 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -372,7 +372,7 @@
/* #undef HAVE_SECURITY_PAM_APPL_H */
/* Define to 1 if you have the `setenv' function. */
-#define HAVE_SETENV 1
+/* #undef HAVE_SETENV */
/* Define to 1 if you have the `setproctitle' function. */
/* #undef HAVE_SETPROCTITLE */
diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h
index f9daaf66d7f..f4841fb3975 100644
--- a/src/include/port/win32_port.h
+++ b/src/include/port/win32_port.h
@@ -471,7 +471,6 @@ extern void _dosmaperr(unsigned long);
/* in port/win32env.c */
extern int pgwin32_putenv(const char *);
-extern int pgwin32_setenv(const char *name, const char *value, int overwrite);
extern void pgwin32_unsetenv(const char *);
/* in port/win32security.c */
@@ -482,7 +481,6 @@ extern int pgwin32_is_admin(void);
extern BOOL AddUserToTokenDacl(HANDLE hToken);
#define putenv(x) pgwin32_putenv(x)
-#define setenv(x,y,z) pgwin32_setenv(x,y,z)
#define unsetenv(x) pgwin32_unsetenv(x)
/* Things that exist in MinGW headers, but need to be added to MSVC */