diff --git a/CMake/Platforms/WindowsCache.cmake b/CMake/Platforms/WindowsCache.cmake index c69c33cc3..7920bd28b 100644 --- a/CMake/Platforms/WindowsCache.cmake +++ b/CMake/Platforms/WindowsCache.cmake @@ -23,30 +23,65 @@ ########################################################################### if(NOT UNIX) if(WIN32) + + set(HAVE_WINDOWS_H 1) + set(HAVE_WS2TCPIP_H 1) + set(HAVE_WINSOCK2_H 1) + set(HAVE_WINCRYPT_H 1) + + if(MINGW) + set(HAVE_SNPRINTF 1) + set(HAVE_UNISTD_H 1) + set(HAVE_INTTYPES_H 1) + set(HAVE_STRTOLL 1) + elseif(MSVC) + if(NOT MSVC_VERSION LESS 1800) + set(HAVE_INTTYPES_H 1) + set(HAVE_STRTOLL 1) + else() + set(HAVE_INTTYPES_H 0) + set(HAVE_STRTOLL 0) + endif() + if(NOT MSVC_VERSION LESS 1900) + set(HAVE_SNPRINTF 1) + else() + set(HAVE_SNPRINTF 0) + endif() + endif() + set(HAVE_LIBSOCKET 0) set(HAVE_GETHOSTNAME 1) set(HAVE_LIBZ 0) set(HAVE_ARPA_INET_H 0) + set(HAVE_ARPA_TFTP_H 0) set(HAVE_FCNTL_H 1) + set(HAVE_IFADDRS_H 0) set(HAVE_IO_H 1) set(HAVE_NETDB_H 0) set(HAVE_NETINET_IN_H 0) + set(HAVE_NETINET_TCP_H 0) set(HAVE_NET_IF_H 0) + set(HAVE_IOCTL_SIOCGIFADDR 0) + set(HAVE_POLL_H 0) set(HAVE_PWD_H 0) set(HAVE_SETJMP_H 1) set(HAVE_SIGNAL_H 1) set(HAVE_STDLIB_H 1) set(HAVE_STRINGS_H 0) set(HAVE_STRING_H 1) + set(HAVE_SYS_FILIO_H 0) + set(HAVE_SYS_IOCTL_H 0) set(HAVE_SYS_PARAM_H 0) set(HAVE_SYS_POLL_H 0) + set(HAVE_SYS_RESOURCE_H 0) set(HAVE_SYS_SELECT_H 0) set(HAVE_SYS_SOCKET_H 0) set(HAVE_SYS_SOCKIO_H 0) set(HAVE_SYS_STAT_H 1) set(HAVE_SYS_TIME_H 0) set(HAVE_SYS_TYPES_H 1) + set(HAVE_SYS_UN_H 0) set(HAVE_SYS_UTIME_H 1) set(HAVE_TERMIOS_H 0) set(HAVE_TERMIO_H 0) @@ -69,6 +104,9 @@ if(NOT UNIX) set(HAVE_GMTIME_R 0) set(HAVE_GETHOSTBYNAME_R 0) set(HAVE_SIGNAL 1) + set(HAVE_LINUX_TCP_H 0) + set(HAVE_GLIBC_STRERROR_R 0) + set(HAVE_MACH_ABSOLUTE_TIME 0) set(HAVE_GETHOSTBYNAME_R_3 0) set(HAVE_GETHOSTBYNAME_R_3_REENTRANT 0) diff --git a/CMakeLists.txt b/CMakeLists.txt index e19deb605..706d9db41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1033,7 +1033,6 @@ check_include_file_concat("poll.h" HAVE_POLL_H) check_include_file_concat("pwd.h" HAVE_PWD_H) check_include_file_concat("setjmp.h" HAVE_SETJMP_H) check_include_file_concat("signal.h" HAVE_SIGNAL_H) -check_include_file_concat("ssl.h" HAVE_SSL_H) check_include_file_concat("stdatomic.h" HAVE_STDATOMIC_H) check_include_file_concat("stdbool.h" HAVE_STDBOOL_H) check_include_file_concat("stdint.h" HAVE_STDINT_H) @@ -1048,7 +1047,6 @@ check_include_file_concat("unistd.h" HAVE_UNISTD_H) check_include_file_concat("utime.h" HAVE_UTIME_H) check_include_file_concat("stddef.h" HAVE_STDDEF_H) -check_include_file_concat("sys/utsname.h" HAVE_SYS_UTSNAME_H) check_type_size(size_t SIZEOF_SIZE_T) check_type_size(ssize_t SIZEOF_SSIZE_T) diff --git a/lib/config-os400.h b/lib/config-os400.h index db8e9082e..083fb316d 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -155,9 +155,6 @@ /* Define if you have the `socket' function. */ #define HAVE_SOCKET -/* Define if you have the header file. */ -#undef HAVE_SSL_H - /* Define if you have the header file. */ #undef HAVE_STDINT_H diff --git a/lib/config-riscos.h b/lib/config-riscos.h index a9268e1e9..94946187d 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -147,9 +147,6 @@ /* Define if you have the `socket' function. */ #define HAVE_SOCKET -/* Define if you have the header file. */ -#undef HAVE_SSL_H - /* Define if you have the header file. */ #undef HAVE_STDINT_H diff --git a/lib/config-win32.h b/lib/config-win32.h index 0879e232a..fd2503668 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -71,9 +71,6 @@ /* Define if you have the header file. */ #define HAVE_SIGNAL_H 1 -/* Define if you have the header file. */ -/* #define HAVE_SSL_H 1 */ - /* Define to 1 if you have the header file. */ #if (defined(_MSC_VER) && (_MSC_VER >= 1800)) || \ defined(__MINGW64_VERSION_MAJOR) diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index 825f5e60c..2f9a53052 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -53,9 +53,6 @@ /* Define if you have the header file. */ #define HAVE_SIGNAL_H 1 -/* Define if you have the header file. */ -/* #define HAVE_SSL_H 1 */ - /* Define if you have the header file. */ #define HAVE_STDLIB_H 1 diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index cdc59333c..9c17b7360 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -457,9 +457,6 @@ /* Define to 1 if you have the socketpair function. */ #cmakedefine HAVE_SOCKETPAIR 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SSL_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_STDATOMIC_H 1 diff --git a/lib/ftp.c b/lib/ftp.c index c04daa8c7..aaf26d549 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -32,9 +32,6 @@ #ifdef HAVE_ARPA_INET_H #include #endif -#ifdef HAVE_UTSNAME_H -#include -#endif #ifdef HAVE_NETDB_H #include #endif diff --git a/lib/imap.c b/lib/imap.c index 045fe24fd..57ab504a6 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -45,9 +45,6 @@ #ifdef HAVE_ARPA_INET_H #include #endif -#ifdef HAVE_UTSNAME_H -#include -#endif #ifdef HAVE_NETDB_H #include #endif diff --git a/lib/pop3.c b/lib/pop3.c index ddb98bfdf..a2ab34aef 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -47,9 +47,6 @@ #ifdef HAVE_ARPA_INET_H #include #endif -#ifdef HAVE_UTSNAME_H -#include -#endif #ifdef HAVE_NETDB_H #include #endif diff --git a/lib/smtp.c b/lib/smtp.c index afcdd10ab..81a17e38d 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -49,9 +49,6 @@ #ifdef HAVE_ARPA_INET_H #include #endif -#ifdef HAVE_UTSNAME_H -#include -#endif #ifdef HAVE_NETDB_H #include #endif diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c index 1cecb649c..722b31335 100644 --- a/lib/vssh/libssh.c +++ b/lib/vssh/libssh.c @@ -40,9 +40,6 @@ #ifdef HAVE_ARPA_INET_H #include #endif -#ifdef HAVE_UTSNAME_H -#include -#endif #ifdef HAVE_NETDB_H #include #endif diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c index 98fce5177..b3d07bf6e 100644 --- a/lib/vssh/libssh2.c +++ b/lib/vssh/libssh2.c @@ -43,9 +43,6 @@ #ifdef HAVE_ARPA_INET_H #include #endif -#ifdef HAVE_UTSNAME_H -#include -#endif #ifdef HAVE_NETDB_H #include #endif