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

windows: delete redundant headers

Browse source 
`winsock2.h` pulls in `windows.h`. `ws2tcpip.h` pulls in `winsock2.h`.
`winsock2.h` and `ws2tcpip.h` are also pulled by `curl/curl.h`.

Keep only those headers that are not already included, or the code under
it uses something from that specific header.

Closes #12539
This commit is contained in:
Viktor Szakats 2023-12-12 19:27:44 +00:00
parent 7e8fdad2d5
commit 03e7dff8ff
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
9 changed files with 3 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/inet_pton.h
View file

@ -31,9 +31,6 @@ int Curl_inet_pton(int, const char *, void *);
#ifdef HAVE_INET_PTON
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#elif defined(USE_WINSOCK)
/* inet_pton() exists in Vista or later */
#include <ws2tcpip.h>
#endif
#define Curl_inet_pton(x,y,z) inet_pton(x,y,z)
#endif

3
lib/socketpair.c
View file

@ -33,9 +33,6 @@
* This is a socketpair() implementation for Windows.
*/
#include <string.h>
#include <winsock2.h>
#include <ws2tcpip.h>
#include <windows.h>
#include <io.h>
#else
#ifdef HAVE_NETDB_H