database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-14 08:21:07 +03:00
Code Activity

Fix up getopt() reset management so it works on recent mingw.

Browse Source 
The mingw people don't appear to care about compatibility with non-GNU
versions of getopt, so force use of our own copy of getopt on Windows.
Also, ensure that we make use of optreset when using our own copy.

Per report from Andrew Dunstan.  Back-patch to all versions supported
on Windows.
This commit is contained in:
Tom Lane
2010-12-15 23:50:41 -05:00
parent 2a6ebe70fb
commit 5cdd65f324
4 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/postmaster/postmaster.c
View File

@ -313,7 +313,8 @@ extern char *optarg;
extern int optind,
opterr;
#ifdef HAVE_INT_OPTRESET
/* If not HAVE_GETOPT, we are using src/port/getopt.c, which has optreset */
#if defined(HAVE_INT_OPTRESET) || !defined(HAVE_GETOPT)
extern int optreset; /* might not be declared by system headers */
#endif
@ -751,7 +752,7 @@ PostmasterMain(int argc, char *argv[])
* getopt(3) library so that it will work correctly in subprocesses.
*/
optind = 1;
#ifdef HAVE_INT_OPTRESET
#if defined(HAVE_INT_OPTRESET) || !defined(HAVE_GETOPT)
optreset = 1; /* some systems need this too */
#endif