diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-08-07 21:11:58 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-08-07 21:11:58 +0000 |
| commit | 33ab177a56b6fe751e70123cf1aa80448d9ca253 (patch) | |
| tree | b86c64fe688b1f4d383e57b836514ec7c1ee1e96 /src/bin/psql/startup.c | |
| parent | fea2ffa7d8ac6c3bf773247f7aa0a1f5fea653f7 (diff) | |
Don't assume that struct option is available just because we can find a
getopt_long(). This is more or less the same problem as we saw earlier
with getaddrinfo() and struct addrinfo, and for the same reason: random
user-added libraries might contain the subroutine, but there's no
guarantee we will find the matching header files.
Diffstat (limited to 'src/bin/psql/startup.c')
| -rw-r--r-- | src/bin/psql/startup.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 7dbe42d5a81..afee6d62a53 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2003, PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.78 2003/08/04 23:59:40 tgl Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.79 2003/08/07 21:11:58 tgl Exp $ */ #include "postgres_fe.h" @@ -17,12 +17,9 @@ #include <win32.h> #endif /* WIN32 */ -#ifdef HAVE_GETOPT_H -#include <getopt.h> -#endif - -#ifndef HAVE_GETOPT_LONG #include "getopt_long.h" + +#ifndef HAVE_OPTRESET int optreset; #endif |