diff options
| author | Marcel Raad <Marcel.Raad@teamviewer.com> | 2021-09-18 01:25:20 +0200 |
|---|---|---|
| committer | Marcel Raad <Marcel.Raad@teamviewer.com> | 2021-09-29 15:54:31 +0200 |
| commit | 0259e8c35fba3000ec9efc02cc22e8efb67d6442 (patch) | |
| tree | 6e42deb2ca4dd8c35895b33de0edaaf7bb57ada2 | |
| parent | f53b89314ddbfe2b3b203a85c2181868c6151363 (diff) | |
| download | curl-0259e8c35fba3000ec9efc02cc22e8efb67d6442.tar.gz | |
lib: remove `HAVE_WINSOCK_H` usage
WinSock v1 is not supported anymore. Exclusively use `HAVE_WINSOCK2_H`
instead.
Closes https://github.com/curl/curl/pull/7795
| -rw-r--r-- | lib/connect.c | 2 | ||||
| -rw-r--r-- | lib/curl_setup.h | 1 | ||||
| -rw-r--r-- | lib/setup-win32.h | 12 |
3 files changed, 3 insertions, 12 deletions
diff --git a/lib/connect.c b/lib/connect.c index d61b0374e..48c98ebd4 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -85,7 +85,7 @@ static bool verifyconnect(curl_socket_t sockfd, int *error); -#if defined(__DragonFly__) || defined(HAVE_WINSOCK_H) +#if defined(__DragonFly__) || defined(HAVE_WINSOCK2_H) /* DragonFlyBSD and Windows use millisecond units */ #define KEEPALIVE_FACTOR(x) (x *= 1000) #else diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 99048c489..3840636f6 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -717,7 +717,6 @@ int netware_init(void); #if defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H) # if defined(SOCKET) || \ defined(USE_WINSOCK) || \ - defined(HAVE_WINSOCK_H) || \ defined(HAVE_WINSOCK2_H) || \ defined(HAVE_WS2TCPIP_H) # error "WinSock and lwIP TCP/IP stack definitions shall not coexist!" diff --git a/lib/setup-win32.h b/lib/setup-win32.h index c35dec88c..12d95e9d5 100644 --- a/lib/setup-win32.h +++ b/lib/setup-win32.h @@ -25,11 +25,11 @@ /* * Include header files for windows builds before redefining anything. * Use this preprocessor block only to include or exclude windows.h, - * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs + * winsock2.h or ws2tcpip.h. Any other windows thing belongs * to any other further and independent block. Under Cygwin things work * just as under linux (e.g. <sys/socket.h>) and the winsock headers should * never be included when __CYGWIN__ is defined. configure script takes - * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H, + * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK2_H, * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined. */ @@ -47,10 +47,6 @@ # ifdef HAVE_WS2TCPIP_H # include <ws2tcpip.h> # endif -# else -# ifdef HAVE_WINSOCK_H -# include <winsock.h> -# endif # endif # include <tchar.h> # ifdef UNICODE @@ -67,10 +63,6 @@ #ifdef HAVE_WINSOCK2_H # define USE_WINSOCK 2 -#else -# ifdef HAVE_WINSOCK_H -# error "WinSock version 1 is no longer supported, version 2 is required!" -# endif #endif /* |