diff options
Diffstat (limited to 'src/port/getopt.c')
| -rw-r--r-- | src/port/getopt.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/port/getopt.c b/src/port/getopt.c index 796a009dfa7..2cc2519116f 100644 --- a/src/port/getopt.c +++ b/src/port/getopt.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/port/getopt.c,v 1.11 2007/03/26 21:44:11 momjian Exp $ */ +/* $PostgreSQL: pgsql/src/port/getopt.c,v 1.12 2009/04/04 21:55:50 tgl Exp $ */ /* This is used by psql under Win32 */ @@ -37,12 +37,25 @@ static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95"; #endif /* LIBC_SCCS and not lint */ +/* + * On some versions of Solaris, opterr and friends are defined in core libc + * rather than in a separate getopt module. Define these variables only + * if configure found they aren't there by default. (We assume that testing + * opterr is sufficient for all of these except optreset.) + */ +#ifndef HAVE_INT_OPTERR + int opterr = 1, /* if error message should be printed */ optind = 1, /* index into parent argv vector */ - optopt, /* character checked for validity */ - optreset; /* reset getopt */ + optopt; /* character checked for validity */ char *optarg; /* argument associated with option */ +#endif + +#ifndef HAVE_INT_OPTRESET +int optreset; /* reset getopt */ +#endif + #define BADCH (int)'?' #define BADARG (int)':' #define EMSG "" |