Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit b7684bd

Browse files
committed
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
1 parent 9ddd1c2 commit b7684bd

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

src/include/pg_config.h.win32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@
372372
/* #undef HAVE_SECURITY_PAM_APPL_H */
373373

374374
/* Define to 1 if you have the `setenv' function. */
375-
#define HAVE_SETENV 1
375+
/* #undef HAVE_SETENV */
376376

377377
/* Define to 1 if you have the `setproctitle' function. */
378378
/* #undef HAVE_SETPROCTITLE */

src/include/port/win32_port.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,6 @@ extern void _dosmaperr(unsigned long);
471471

472472
/* in port/win32env.c */
473473
extern int pgwin32_putenv(const char *);
474-
extern int pgwin32_setenv(const char *name, const char *value, int overwrite);
475474
extern void pgwin32_unsetenv(const char *);
476475

477476
/* in port/win32security.c */
@@ -482,7 +481,6 @@ extern int pgwin32_is_admin(void);
482481
extern BOOL AddUserToTokenDacl(HANDLE hToken);
483482

484483
#define putenv(x) pgwin32_putenv(x)
485-
#define setenv(x,y,z) pgwin32_setenv(x,y,z)
486484
#define unsetenv(x) pgwin32_unsetenv(x)
487485

488486
/* Things that exist in MinGW headers, but need to be added to MSVC */

0 commit comments

Comments
 (0)