diff options
author | Marc Hoersken <info@marc-hoersken.de> | 2020-08-30 12:21:53 +0200 |
---|---|---|
committer | Marc Hoersken <info@marc-hoersken.de> | 2020-09-02 16:30:39 +0200 |
commit | 3e4b32a3e1250d49bd0e45a35b3a08a2f4d07d8f (patch) | |
tree | 8203eec934f180afe2bad1ae54ac77dc8ffd7e69 /tests | |
parent | 20d74b7393d5aedcc9d54c92b8ed56cae473d04e (diff) | |
download | curl-3e4b32a3e1250d49bd0e45a35b3a08a2f4d07d8f.tar.gz |
win32: drop support for WinSock version 1, require version 2
IPv6, telnet and now also the multi API require WinSock
version 2 which is available starting with Windows 95.
Therefore we think it is time to drop support for version 1.
Reviewed-by: Marcel Raad
Reviewed-by: Jay Satiro
Reviewed-by: Daniel Stenberg
Reviewed-by: Viktor Szakats
Follow up to #5634
Closes #5854
Diffstat (limited to 'tests')
-rw-r--r-- | tests/server/util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/server/util.c b/tests/server/util.c index dccce596b..e95d574f9 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -167,8 +167,8 @@ void win32_init(void) WORD wVersionRequested; WSADATA wsaData; int err; - wVersionRequested = MAKEWORD(USE_WINSOCK, USE_WINSOCK); + wVersionRequested = MAKEWORD(2, 2); err = WSAStartup(wVersionRequested, &wsaData); if(err != 0) { @@ -177,8 +177,8 @@ void win32_init(void) exit(1); } - if(LOBYTE(wsaData.wVersion) != USE_WINSOCK || - HIBYTE(wsaData.wVersion) != USE_WINSOCK) { + if(LOBYTE(wsaData.wVersion) != LOBYTE(wVersionRequested) || + HIBYTE(wsaData.wVersion) != HIBYTE(wVersionRequested) ) { WSACleanup(); perror("Winsock init failed"); logmsg("No suitable winsock.dll found -- aborting"); |