summaryrefslogtreecommitdiff
path: root/src/bin/pg_dump/pg_restore.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2003-08-07 21:11:58 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2003-08-07 21:11:58 +0000
commit33ab177a56b6fe751e70123cf1aa80448d9ca253 (patch)
treeb86c64fe688b1f4d383e57b836514ec7c1ee1e96 /src/bin/pg_dump/pg_restore.c
parentfea2ffa7d8ac6c3bf773247f7aa0a1f5fea653f7 (diff)
downloadpostgresql-33ab177a56b6fe751e70123cf1aa80448d9ca253.tar.gz
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/pg_dump/pg_restore.c')
-rw-r--r--src/bin/pg_dump/pg_restore.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 0598c9c451..f9217f2c09 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -34,7 +34,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_restore.c,v 1.49 2003/08/04 00:43:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_restore.c,v 1.50 2003/08/07 21:11:58 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -55,12 +55,9 @@
#include <unistd.h>
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-
-#ifndef HAVE_GETOPT_LONG
#include "getopt_long.h"
+
+#ifndef HAVE_OPTRESET
int optreset;
#endif