luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib: remove HAVE_WINSOCK_H usage

Browse Source 
WinSock v1 is not supported anymore. Exclusively use `HAVE_WINSOCK2_H`
instead.

Closes https://github.com/curl/curl/pull/7795
This commit is contained in:
Marcel Raad 2021-09-18 01:25:20 +02:00
parent f53b89314d
commit 0259e8c35f
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/connect.c
View File

@ -85,7 +85,7 @@
static bool verifyconnect(curl_socket_t sockfd, int *error); 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 */ /* DragonFlyBSD and Windows use millisecond units */
#define KEEPALIVE_FACTOR(x) (x *= 1000) #define KEEPALIVE_FACTOR(x) (x *= 1000)
#else #else

1
lib/curl_setup.h
View File

@ -717,7 +717,6 @@ int netware_init(void);
#if defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H) #if defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H)
# if defined(SOCKET) || \ # if defined(SOCKET) || \
defined(USE_WINSOCK) || \ defined(USE_WINSOCK) || \
defined(HAVE_WINSOCK_H) || \
defined(HAVE_WINSOCK2_H) || \ defined(HAVE_WINSOCK2_H) || \
defined(HAVE_WS2TCPIP_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!"

12
lib/setup-win32.h
View File

@ -25,11 +25,11 @@
/* /*
* Include header files for windows builds before redefining anything. * Include header files for windows builds before redefining anything.
* Use this preprocessor block only to include or exclude windows.h, * 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 * 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 * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
* never be included when __CYGWIN__ is defined. configure script takes * 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. * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
*/ */
@ -47,10 +47,6 @@
# ifdef HAVE_WS2TCPIP_H # ifdef HAVE_WS2TCPIP_H
# include <ws2tcpip.h> # include <ws2tcpip.h>
# endif # endif
# else
# ifdef HAVE_WINSOCK_H
# include <winsock.h>
# endif
# endif # endif
# include <tchar.h> # include <tchar.h>
# ifdef UNICODE # ifdef UNICODE
@ -67,10 +63,6 @@
#ifdef HAVE_WINSOCK2_H #ifdef HAVE_WINSOCK2_H
# define USE_WINSOCK 2 # define USE_WINSOCK 2
#else
# ifdef HAVE_WINSOCK_H
# error "WinSock version 1 is no longer supported, version 2 is required!"
# endif
#endif #endif
/* /*