The following is required in order to make beta1 compile on the Win32

bmomjian · bmomjian · commit ce9f73c16235 · 2000-02-24T15:53:12.000Z
platform (psql and libpq):

The file "config.h.win32" in the include\ directory (from my patch from
2000-01-18) is missing from the tree. It needs to be put back :-)

The following patch has to be applied in the interfaces\libpq directory.


//Magnus
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.121 2000/02/21 12:26:19 wieck Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.122 2000/02/24 15:53:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -592,6 +592,7 @@ connectMakeNonblocking(PGconn *conn)
 #ifndef WIN32
 	if (fcntl(conn->sock, F_SETFL, O_NONBLOCK) < 0)
 #else
+	int on = 1;
 	if (ioctlsocket(conn->sock, FIONBIO, &on) != 0)
 #endif
 	{
diff --git a/src/interfaces/libpq/libpqdll.def b/src/interfaces/libpq/libpqdll.def
@@ -72,7 +72,7 @@ EXPORTS
 	initPQExpBuffer		@ 69
 	resetPQExpBuffer	@ 70
 	PQoidValue		@ 71
-	PQclientencoding	@ 72
+	PQclientEncoding	@ 72
 	PQenv2encoding		@ 73
 	appendBinaryPQExpBuffer	@ 74
 	appendPQExpBufferStr	@ 75
diff --git a/src/interfaces/libpq/win32.h b/src/interfaces/libpq/win32.h
@@ -4,6 +4,7 @@
  * strcasecmp() is not in Windows, stricmp is, though
  */
 #define strcasecmp(a,b) stricmp(a,b)
+#define strncasecmp(a,b,c) _strnicmp(a,b,c)
 
 #define SOCKET_SIZE_TYPE int
 
@@ -16,6 +17,7 @@
 #define write(a,b,c) _write(a,b,c)
 #define popen(a,b) _popen(a,b)
 #define pclose(a) _pclose(a)
+#define vsnprintf(a,b,c,d) _vsnprintf(a,b,c,d)
 
 /*
  * crypt not available (yet)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.121 2000/02/21 12:26:19 wieck Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.122 2000/02/24 15:53:12 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -592,6 +592,7 @@ connectMakeNonblocking(PGconn *conn)`
`592`	`592`	`#ifndef WIN32`
`593`	`593`	`if (fcntl(conn->sock, F_SETFL, O_NONBLOCK) < 0)`
`594`	`594`	`#else`
	`595`	`+ int on = 1;`
`595`	`596`	`if (ioctlsocket(conn->sock, FIONBIO, &on) != 0)`
`596`	`597`	`#endif`
`597`	`598`	`{`