Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit d5a9a66

Browse files
committed
Update the Winsock API version requested by libpq.
According to Microsoft's documentation, 2.2 has been the current version since Windows 98 or so. Moreover, that's what the Postgres backend has been requesting since 2004 (cf commit 4cdf51e). So there seems no reason for libpq to keep asking for 1.1. Bring thread_test along, too, so that we're uniformly asking for 2.2 in all our WSAStartup calls. It's not clear whether there's any point in back-patching this, so for now I didn't. Discussion: https://postgr.es/m/132799.1602960277@sss.pgh.pa.us
1 parent 929c69a commit d5a9a66

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/interfaces/libpq/fe-connect.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3883,7 +3883,7 @@ makeEmptyPGconn(void)
38833883
{
38843884
WSADATA wsaData;
38853885

3886-
if (WSAStartup(MAKEWORD(1, 1), &wsaData) != 0)
3886+
if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0)
38873887
return NULL;
38883888
wsastartup_done = true;
38893889
}

src/test/thread/thread_test.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ main(int argc, char *argv[])
126126
#endif
127127

128128
#ifdef WIN32
129-
err = WSAStartup(MAKEWORD(1, 1), &wsaData);
129+
err = WSAStartup(MAKEWORD(2, 2), &wsaData);
130130
if (err != 0)
131131
{
132132
fprintf(stderr, "Cannot start the network subsystem - %d**\nexiting\n", err);

0 commit comments

Comments
 (0)