1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary declaration in win32_port.h

Browse Source 
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
This commit is contained in:
Michael Paquier 2021-06-08 13:40:10 +09:00
parent 9ddd1c27ee
commit b7684bd105
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/pg_config.h.win32
View File

@ -372,7 +372,7 @@
/* #undef HAVE_SECURITY_PAM_APPL_H */ /* #undef HAVE_SECURITY_PAM_APPL_H */
/* Define to 1 if you have the `setenv' function. */ /* 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. */ /* Define to 1 if you have the `setproctitle' function. */
/* #undef HAVE_SETPROCTITLE */ /* #undef HAVE_SETPROCTITLE */

2
src/include/port/win32_port.h
View File

@ -471,7 +471,6 @@ extern void _dosmaperr(unsigned long);
/* in port/win32env.c */ /* in port/win32env.c */
extern int pgwin32_putenv(const char *); extern int pgwin32_putenv(const char *);
extern int pgwin32_setenv(const char *name, const char *value, int overwrite);
extern void pgwin32_unsetenv(const char *); extern void pgwin32_unsetenv(const char *);
/* in port/win32security.c */ /* in port/win32security.c */
@ -482,7 +481,6 @@ extern int pgwin32_is_admin(void);
extern BOOL AddUserToTokenDacl(HANDLE hToken); extern BOOL AddUserToTokenDacl(HANDLE hToken);
#define putenv(x) pgwin32_putenv(x) #define putenv(x) pgwin32_putenv(x)
#define setenv(x,y,z) pgwin32_setenv(x,y,z)
#define unsetenv(x) pgwin32_unsetenv(x) #define unsetenv(x) pgwin32_unsetenv(x)
/* Things that exist in MinGW headers, but need to be added to MSVC */ /* Things that exist in MinGW headers, but need to be added to MSVC */