diff options
| author | Bruce Momjian | 1999-07-19 02:27:16 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1999-07-19 02:27:16 +0000 |
| commit | e44c93180172b892993fcb77370c5546606b34ab (patch) | |
| tree | c6096c88d9320a3b7be2d7a645577966253046a6 /src/bin | |
| parent | 677028177e231ca8dce4c237a026e3d3b58cb314 (diff) | |
Re-add getopt.h check, remove NT-specific tests for it.
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/pg_dump/pg_dump.c | 4 | ||||
| -rw-r--r-- | src/bin/pg_id/pg_id.c | 10 | ||||
| -rw-r--r-- | src/bin/psql/psql.c | 7 |
3 files changed, 13 insertions, 8 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index c1597d7f26c..cd48c73a805 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.117 1999/07/17 20:18:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.118 1999/07/19 02:27:08 momjian Exp $ * * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb * @@ -75,7 +75,7 @@ #include <termios.h> #endif -#ifdef __CYGWIN32__ +#ifdef HAVE_GETOPT_H #include <getopt.h> #endif diff --git a/src/bin/pg_id/pg_id.c b/src/bin/pg_id/pg_id.c index d14d653c60e..70da5f5d5d5 100644 --- a/src/bin/pg_id/pg_id.c +++ b/src/bin/pg_id/pg_id.c @@ -9,16 +9,18 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/pg_id.c,v 1.8 1999/02/13 23:20:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/pg_id.c,v 1.9 1999/07/19 02:27:09 momjian Exp $ * *------------------------------------------------------------------------- */ -#include <sys/types.h> -#include <pwd.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#ifdef __CYGWIN32__ +#include <sys/types.h> +#include <pwd.h> + +#include "postgres.h" +#ifdef HAVE_GETOPT_H #include <getopt.h> #endif diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c index 5b042bdab6b..c7aaf83f987 100644 --- a/src/bin/psql/psql.c +++ b/src/bin/psql/psql.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.183 1999/07/17 20:18:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.184 1999/07/19 02:27:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,13 +32,16 @@ #include "pqsignal.h" #include "stringutils.h" #include "psqlHelp.h" + #ifndef HAVE_STRDUP #include "strdup.h" #endif + #ifdef HAVE_TERMIOS_H #include <termios.h> #endif -#ifdef __CYGWIN32__ + +#ifdef HAVE_GETOPT_H #include <getopt.h> #endif |