Re-add getopt.h check, remove NT-specific tests for it.

src/interfaces/ecpg/preproc/ecpg.c

@@ -5,7 +5,7 @@
 #include <unistd.h>
 #include "postgres.h"
 
-#ifdef __CYGWIN32__
+#ifdef HAVE_GETOPT_H
 #include "getopt.h"
 #endif
 

src/interfaces/libpq/fe-auth.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.30 1999/07/17 20:18:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.31 1999/07/19 02:27:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,10 +25,12 @@
  *
  */
 
+#include <unistd.h>
+
+#include "postgres.h"
 #include "libpq-fe.h"
 #include "libpq-int.h"
 #include "fe-auth.h"
-#include "postgres.h"
 
 #ifdef WIN32
 #include "win32.h"
@@ -37,11 +39,8 @@
 #ifndef  MAXHOSTNAMELEN
 #include <netdb.h>				/* for MAXHOSTNAMELEN on some */
 #endif
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
-#endif
 #include <pwd.h>
-#endif	 /* WIN32 */
+#endif
 
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>

src/interfaces/libpq/fe-connect.c

@@ -7,28 +7,27 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.99 1999/07/17 20:18:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.100 1999/07/19 02:27:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "postgres.h"
 #include "libpq-fe.h"
 #include "libpq-int.h"
 #include "fe-auth.h"
-#include "postgres.h"
 
 #ifdef WIN32
 #include "win32.h"
 #else
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
-#endif
 #include <netdb.h>
 #include <netinet/tcp.h>
 #endif
-#include <fcntl.h>
-#include <errno.h>
-#include <ctype.h>				/* for isspace() */
 
 #ifndef HAVE_STRDUP
 #include "strdup.h"

src/interfaces/libpq/fe-exec.c

@@ -7,23 +7,21 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.82 1999/07/17 20:18:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.83 1999/07/19 02:27:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <unistd.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "postgres.h"
 #include "libpq-fe.h"
 #include "libpq-int.h"
-#include "postgres.h"
 
 #ifdef WIN32
 #include "win32.h"
-#else
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
 #endif
-#endif
-#include <errno.h>
-#include <ctype.h>
 
 
 /* keep this in same order as ExecStatusType in libpq-fe.h */

src/interfaces/libpq/fe-lobj.c

@@ -7,25 +7,23 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.21 1999/07/17 20:18:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.22 1999/07/19 02:27:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
+#include <unistd.h>
+#include <fcntl.h>
+#include <io.h>
+#include <sys/stat.h>
+
+#include "postgres.h"
 #include "libpq-fe.h"
 #include "libpq-int.h"
-#include "postgres.h"
 
 #ifdef WIN32
 #include "win32.h"
-#include <io.h>
-#else
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
 #endif
-#endif
-#include <fcntl.h>
-#include <sys/stat.h>
 
 #include "libpq/libpq-fs.h"		/* must come after sys/stat.h */
 

src/interfaces/libpq/fe-misc.c

@@ -24,28 +24,25 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.26 1999/07/17 20:18:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.27 1999/07/19 02:27:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "libpq-fe.h"
-#include "libpq-int.h"
-
-#include "postgres.h"
-#include "pqsignal.h"
-
+#include <unistd.h>
+#include <sys/time.h>
 #include <errno.h>
 #include <signal.h>
 #include <time.h>
+
+#include "postgres.h"
+#include "libpq-fe.h"
+#include "libpq-int.h"
+#include "pqsignal.h"
+
 #ifdef WIN32
 #include "win32.h"
-#else
-#include <sys/time.h>
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
 #endif
-#endif	 /* WIN32 */
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>

src/interfaces/libpq/fe-print.c

@@ -9,29 +9,29 @@
  * didn't really belong there.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.24 1999/07/17 20:18:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.25 1999/07/19 02:27:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <unistd.h>
+#include <signal.h>
+
+#include "postgres.h"
 #include "libpq-fe.h"
 #include "libpq-int.h"
-#include "postgres.h"
 #include "pqsignal.h"
 
 #ifdef WIN32
 #include "win32.h"
 #else
-#if !defined(NO_UNISTD_H)
-#include <unistd.h>
-#endif
 #include <sys/ioctl.h>
-#ifndef HAVE_TERMIOS_H
-#include <sys/termios.h>
-#else
-#include <termios.h>
 #endif
-#endif	 /* WIN32 */
-#include <signal.h>
+
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#else
+#include <sys/termios.h>
+#endif
 
 #ifdef MULTIBYTE
 #include "mb/pg_wchar.h"

src/interfaces/libpq/win32.h

@@ -5,9 +5,6 @@
  */
 #define strcasecmp(a,b) stricmp(a,b)
 
-
-
-#define NO_UNISTD_H
 #define SOCKET_SIZE_TYPE int
 
 /*