diff options
| author | Bruce Momjian <bruce@momjian.us> | 2000-02-24 15:53:12 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2000-02-24 15:53:12 +0000 |
| commit | ce9f73c16235d49dfc1a9a7314cafcef5c63a365 (patch) | |
| tree | 4aee52b5c4ecaf60de098bb9037f4b456626109c | |
| parent | 58f481c4ff616fbe777881fe6b5a1a864b680678 (diff) | |
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
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 3 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpqdll.def | 2 | ||||
| -rw-r--r-- | src/interfaces/libpq/win32.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 8443b75f517..4f94b7b0a1d 100644 --- 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 dc33dc0ee90..4c8e0e54a14 100644 --- 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 91f7df1a2d3..3b57134f02d 100644 --- 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) |