diff options
| author | Marcel Raad <Marcel.Raad@teamviewer.com> | 2021-09-29 14:52:38 +0200 |
|---|---|---|
| committer | Marcel Raad <Marcel.Raad@teamviewer.com> | 2021-09-29 15:54:36 +0200 |
| commit | 2bde1774fff9e88958238c0ff1dec0de76f97f8b (patch) | |
| tree | 2ff7a4f649cf6520c90d7ad1c9d0e418560a25ef | |
| parent | 60300291fdd62a0b808c78942a2ce0aae872cab0 (diff) | |
| download | curl-2bde1774fff9e88958238c0ff1dec0de76f97f8b.tar.gz | |
CMake: remove `HAVE_WINSOCK_H` definition
It's not used anymore.
Closes https://github.com/curl/curl/pull/7795
| -rw-r--r-- | CMake/CurlTests.c | 20 | ||||
| -rw-r--r-- | CMake/OtherTests.cmake | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lib/curl_config.h.cmake | 3 |
4 files changed, 0 insertions, 25 deletions
diff --git a/CMake/CurlTests.c b/CMake/CurlTests.c index e418146b4..8666da0da 100644 --- a/CMake/CurlTests.c +++ b/CMake/CurlTests.c @@ -229,10 +229,6 @@ int main () { ; return 0; } # include <windows.h> # ifdef HAVE_WINSOCK2_H # include <winsock2.h> -# else -# ifdef HAVE_WINSOCK_H -# include <winsock.h> -# endif # endif #endif @@ -258,10 +254,6 @@ main () # include <windows.h> # ifdef HAVE_WINSOCK2_H # include <winsock2.h> -# else -# ifdef HAVE_WINSOCK_H -# include <winsock.h> -# endif # endif #endif @@ -285,10 +277,6 @@ main () # include <windows.h> # ifdef HAVE_WINSOCK2_H # include <winsock2.h> -# else -# ifdef HAVE_WINSOCK_H -# include <winsock.h> -# endif # endif #endif @@ -313,10 +301,6 @@ main () # include <windows.h> # ifdef HAVE_WINSOCK2_H # include <winsock2.h> -# else -# ifdef HAVE_WINSOCK_H -# include <winsock.h> -# endif # endif #endif @@ -403,10 +387,6 @@ main () # include <windows.h> # ifdef HAVE_WINSOCK2_H # include <winsock2.h> -# else -# ifdef HAVE_WINSOCK_H -# include <winsock.h> -# endif # endif #endif /* includes start */ diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake index 5cddf4afa..73c813fe5 100644 --- a/CMake/OtherTests.cmake +++ b/CMake/OtherTests.cmake @@ -33,7 +33,6 @@ set(signature_call_conv) if(HAVE_WINDOWS_H) add_header_include(HAVE_WINSOCK2_H "winsock2.h") add_header_include(HAVE_WINDOWS_H "windows.h") - add_header_include(HAVE_WINSOCK_H "winsock.h") set(_source_epilogue "${_source_epilogue}\n#ifndef WIN32_LEAN_AND_MEAN\n#define WIN32_LEAN_AND_MEAN\n#endif") set(signature_call_conv "PASCAL") diff --git a/CMakeLists.txt b/CMakeLists.txt index cf9c390c3..58e3c0366 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -910,7 +910,6 @@ endif() # Check for header files if(NOT UNIX) check_include_file_concat("windows.h" HAVE_WINDOWS_H) - check_include_file_concat("winsock.h" HAVE_WINSOCK_H) check_include_file_concat("ws2tcpip.h" HAVE_WS2TCPIP_H) check_include_file_concat("winsock2.h" HAVE_WINSOCK2_H) check_include_file_concat("wincrypt.h" HAVE_WINCRYPT_H) diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index 4ef4883b2..d2a0f438c 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -710,9 +710,6 @@ /* Define to 1 if you have the winsock2.h header file. */ #cmakedefine HAVE_WINSOCK2_H 1 -/* Define to 1 if you have the winsock.h header file. */ -#cmakedefine HAVE_WINSOCK_H 1 - /* Define this symbol if your OS supports changing the contents of argv */ #cmakedefine HAVE_WRITABLE_ARGV 1 |