Skip to content

Commit ce9f73c

Browse files
committed
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
1 parent 58f481c commit ce9f73c

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

src/interfaces/libpq/fe-connect.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* 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 $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -592,6 +592,7 @@ connectMakeNonblocking(PGconn *conn)
592592
#ifndef WIN32
593593
if (fcntl(conn->sock, F_SETFL, O_NONBLOCK) < 0)
594594
#else
595+
int on = 1;
595596
if (ioctlsocket(conn->sock, FIONBIO, &on) != 0)
596597
#endif
597598
{

src/interfaces/libpq/libpqdll.def

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ EXPORTS
7272
initPQExpBuffer @ 69
7373
resetPQExpBuffer @ 70
7474
PQoidValue @ 71
75-
PQclientencoding @ 72
75+
PQclientEncoding @ 72
7676
PQenv2encoding @ 73
7777
appendBinaryPQExpBuffer @ 74
7878
appendPQExpBufferStr @ 75

src/interfaces/libpq/win32.h

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* strcasecmp() is not in Windows, stricmp is, though
55
*/
66
#define strcasecmp(a,b) stricmp(a,b)
7+
#define strncasecmp(a,b,c) _strnicmp(a,b,c)
78

89
#define SOCKET_SIZE_TYPE int
910

@@ -16,6 +17,7 @@
1617
#define write(a,b,c) _write(a,b,c)
1718
#define popen(a,b) _popen(a,b)
1819
#define pclose(a) _pclose(a)
20+
#define vsnprintf(a,b,c,d) _vsnprintf(a,b,c,d)
1921

2022
/*
2123
* crypt not available (yet)

0 commit comments

Comments
 (0)