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 /lib/curl_setup.h | |
| 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 'lib/curl_setup.h')
| -rw-r--r-- | lib/curl_setup.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 9b845c8d8..276caaa26 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -560,14 +560,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 * are available if PSDK is properly installed. @@ -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 |