diff options
| author | Brad King <brad.king@kitware.com> | 2024-01-31 15:02:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-01-31 15:02:45 (GMT) |
| commit | e28ea90c1be2e7d3963effa3f7d80f2c8bf3d1d4 (patch) | |
| tree | 61d94e6d1e595c9ab06bac9e70a153162f523ab8 /Utilities/cmcurl/CMake/CurlTests.c | |
| parent | 692463d271c5afae5c48b8f05117a9a2e035d6be (diff) | |
| parent | 851cc904a0f3615c9560a2eeba83e04556c0090b (diff) | |
| download | CMake-e28ea90c1be2e7d3963effa3f7d80f2c8bf3d1d4.zip CMake-e28ea90c1be2e7d3963effa3f7d80f2c8bf3d1d4.tar.gz CMake-e28ea90c1be2e7d3963effa3f7d80f2c8bf3d1d4.tar.bz2 | |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2024-01-31 (5ce164e0)
Diffstat (limited to 'Utilities/cmcurl/CMake/CurlTests.c')
| -rw-r--r-- | Utilities/cmcurl/CMake/CurlTests.c | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c index e546286..83d743d 100644 --- a/Utilities/cmcurl/CMake/CurlTests.c +++ b/Utilities/cmcurl/CMake/CurlTests.c @@ -164,14 +164,11 @@ int main(void) { ; return 0; } #ifdef HAVE_IOCTLSOCKET /* includes start */ -#ifdef HAVE_WINDOWS_H +#ifdef _WIN32 # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif -# ifdef HAVE_WINSOCK2_H -# include <winsock2.h> -# endif -# include <windows.h> +# include <winsock2.h> #endif int main(void) { @@ -186,14 +183,11 @@ int main(void) #ifdef HAVE_IOCTLSOCKET_CAMEL /* includes start */ -#ifdef HAVE_WINDOWS_H +#ifdef _WIN32 # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif -# ifdef HAVE_WINSOCK2_H -# include <winsock2.h> -# endif -# include <windows.h> +# include <winsock2.h> #endif int main(void) { @@ -207,14 +201,11 @@ int main(void) #ifdef HAVE_IOCTLSOCKET_CAMEL_FIONBIO /* includes start */ -#ifdef HAVE_WINDOWS_H +#ifdef _WIN32 # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif -# ifdef HAVE_WINSOCK2_H -# include <winsock2.h> -# endif -# include <windows.h> +# include <winsock2.h> #endif int main(void) { @@ -229,14 +220,11 @@ int main(void) #ifdef HAVE_IOCTLSOCKET_FIONBIO /* includes start */ -#ifdef HAVE_WINDOWS_H +#ifdef _WIN32 # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif -# ifdef HAVE_WINSOCK2_H -# include <winsock2.h> -# endif -# include <windows.h> +# include <winsock2.h> #endif int main(void) { @@ -307,14 +295,11 @@ int main(void) #ifdef HAVE_SETSOCKOPT_SO_NONBLOCK /* includes start */ -#ifdef HAVE_WINDOWS_H +#ifdef _WIN32 # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif -# ifdef HAVE_WINSOCK2_H -# include <winsock2.h> -# endif -# include <windows.h> +# include <winsock2.h> #endif /* includes start */ #ifdef HAVE_SYS_TYPES_H |