romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 01:33:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

win32: drop support for WinSock version 1, require version 2

Browse source 
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
This commit is contained in:
Marc Hoersken 2020-08-30 12:21:53 +02:00
parent 20d74b7393
commit 3e4b32a3e1
No known key found for this signature in database
GPG key ID: 61E03CBED7BC859E
5 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/curl_setup.h
View file

@ -559,14 +559,6 @@
/* ---------------------------------------------------------------- */
/*
* When using WINSOCK, TELNET protocol requires WINSOCK2 API.
*/
#if defined(USE_WINSOCK) && (USE_WINSOCK != 2)
# define CURL_DISABLE_TELNET 1
#endif
/*
* msvc 6.0 does not have struct sockaddr_storage and
* does not define IPPROTO_ESP in winsock2.h. But both
@ -705,7 +697,7 @@ int netware_init(void);
defined(HAVE_WINSOCK_H) || \
defined(HAVE_WINSOCK2_H) || \
defined(HAVE_WS2TCPIP_H)
# error "Winsock and lwIP TCP/IP stack definitions shall not coexist!"
# error "WinSock and lwIP TCP/IP stack definitions shall not coexist!"
# endif
#endif