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

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
index 8443b75..4f94b7b 100644 (file)
--- 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
index dc33dc0..4c8e0e5 100644 (file)
--- 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
index 91f7df1..3b57134 100644 (file)
--- 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)