Enable WIN32 compilation of libpq.

bmomjian · bmomjian · commit e259780b1393 · 1999-07-19T06:25:40.000Z
diff --git a/src/backend/utils/mb/common.c b/src/backend/utils/mb/common.c
@@ -2,14 +2,15 @@
  * This file contains some public functions
  * usable for both the backend and the frontend.
  * Tatsuo Ishii
- * $Id: common.c,v 1.6 1999/07/19 02:27:07 momjian Exp $ */
+ * $Id: common.c,v 1.7 1999/07/19 06:25:38 momjian Exp $ */
 
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
 
 #ifdef WIN32
 #include "win32.h"
+#else
+#include <unistd.h>
 #endif
 
 #include "mb/pg_wchar.h"
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.31 1999/07/19 02:27:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.32 1999/07/19 06:25:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,8 +25,6 @@
  *
  */
 
-#include <unistd.h>
-
 #include "postgres.h"
 #include "libpq-fe.h"
 #include "libpq-int.h"
@@ -35,6 +33,7 @@
 #ifdef WIN32
 #include "win32.h"
 #else
+#include <unistd.h>
 #include <sys/param.h>			/* for MAXHOSTNAMELEN on most */
 #ifndef  MAXHOSTNAMELEN
 #include <netdb.h>				/* for MAXHOSTNAMELEN on some */
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.100 1999/07/19 02:27:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.101 1999/07/19 06:25:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <ctype.h>
@@ -25,6 +24,7 @@
 #ifdef WIN32
 #include "win32.h"
 #else
+#include <unistd.h>
 #include <netdb.h>
 #include <netinet/tcp.h>
 #endif
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.83 1999/07/19 02:27:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.84 1999/07/19 06:25:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
 
@@ -21,6 +20,8 @@
 
 #ifdef WIN32
 #include "win32.h"
+#else
+#include <unistd.h>
 #endif
 
 
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.23 1999/07/19 02:45:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.24 1999/07/19 06:25:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 
@@ -23,6 +22,8 @@
 #ifdef WIN32
 #include "win32.h"
 #include "io.h"
+#else
+#include <unistd.h>
 #endif
 
 #include "libpq/libpq-fs.h"		/* must come after sys/stat.h */
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
@@ -24,12 +24,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.27 1999/07/19 02:27:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.28 1999/07/19 06:25:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <unistd.h>
 #include <sys/time.h>
 #include <errno.h>
 #include <signal.h>
@@ -42,6 +41,8 @@
 
 #ifdef WIN32
 #include "win32.h"
+#else
+#include <unistd.h>
 #endif
 
 #ifdef HAVE_SYS_SELECT_H
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
@@ -9,11 +9,10 @@
  * didn't really belong there.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.25 1999/07/19 02:27:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.26 1999/07/19 06:25:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <unistd.h>
 #include <signal.h>
 
 #include "postgres.h"
@@ -24,6 +23,7 @@
 #ifdef WIN32
 #include "win32.h"
 #else
+#include <unistd.h>
 #include <sys/ioctl.h>
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.31 1999/07/19 02:27:14 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.32 1999/07/19 06:25:38 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -25,8 +25,6 @@`
`25`	`25`	`*`
`26`	`26`	`*/`
`27`	`27`
`28`		`-#include <unistd.h>`
`29`		`-`
`30`	`28`	`#include "postgres.h"`
`31`	`29`	`#include "libpq-fe.h"`
`32`	`30`	`#include "libpq-int.h"`
`@@ -35,6 +33,7 @@`
`35`	`33`	`#ifdef WIN32`
`36`	`34`	`#include "win32.h"`
`37`	`35`	`#else`
	`36`	`+#include <unistd.h>`
`38`	`37`	`#include <sys/param.h> /* for MAXHOSTNAMELEN on most */`
`39`	`38`	`#ifndef MAXHOSTNAMELEN`
`40`	`39`	`#include <netdb.h> /* for MAXHOSTNAMELEN on some */`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,10 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.83 1999/07/19 02:27:15 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.84 1999/07/19 06:25:39 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`		`-#include <unistd.h>`
`15`	`14`	`#include <errno.h>`
`16`	`15`	`#include <ctype.h>`
`17`	`16`
`@@ -21,6 +20,8 @@`
`21`	`20`
`22`	`21`	`#ifdef WIN32`
`23`	`22`	`#include "win32.h"`
	`23`	`+#else`
	`24`	`+#include <unistd.h>`
`24`	`25`	`#endif`
`25`	`26`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,11 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.23 1999/07/19 02:45:43 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.24 1999/07/19 06:25:39 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`
`15`		`-#include <unistd.h>`
`16`	`15`	`#include <fcntl.h>`
`17`	`16`	`#include <sys/stat.h>`
`18`	`17`
`@@ -23,6 +22,8 @@`
`23`	`22`	`#ifdef WIN32`
`24`	`23`	`#include "win32.h"`
`25`	`24`	`#include "io.h"`
	`25`	`+#else`
	`26`	`+#include <unistd.h>`
`26`	`27`	`#endif`
`27`	`28`
`28`	`29`	`#include "libpq/libpq-fs.h" /* must come after sys/stat.h */`
Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,11 @@`
`24`	`24`	`*`
`25`	`25`	`*`
`26`	`26`	`* IDENTIFICATION`
`27`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.27 1999/07/19 02:27:15 momjian Exp $`
	`27`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.28 1999/07/19 06:25:40 momjian Exp $`
`28`	`28`	`*`
`29`	`29`	`*-------------------------------------------------------------------------`
`30`	`30`	`*/`
`31`	`31`
`32`		`-#include <unistd.h>`
`33`	`32`	`#include <sys/time.h>`
`34`	`33`	`#include <errno.h>`
`35`	`34`	`#include <signal.h>`
`@@ -42,6 +41,8 @@`
`42`	`41`
`43`	`42`	`#ifdef WIN32`
`44`	`43`	`#include "win32.h"`
	`44`	`+#else`
	`45`	`+#include <unistd.h>`
`45`	`46`	`#endif`
`46`	`47`
`47`	`48`	`#ifdef HAVE_SYS_SELECT_H`