b8b1dc0a0d
Viktor Szakats
2026-08-18
Subject
config-win32.h: drop UWP, c-ares, simplify more
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/config-win32.h+17 -76
| @@ -24,40 +24,26 @@ | |
| * | |
| ***************************************************************************/ | |
| - | /* ======================================================================== */ |
| /* Handcrafted config file for building via Visual Studio IDE Project Files */ | |
| - | /* ======================================================================== */ |
| #if !defined(_MSC_VER) || _MSC_VER > 1800 | |
| #error This manual configuration requires MSVC 2010-2013 (IDE Project builds) | |
| #endif | |
| - | /* ---------------------------------------------------------------- */ |
| - | /* HEADER FILES */ |
| - | /* ---------------------------------------------------------------- */ |
| + | /* |
| + | * Headers and functions |
| + | */ |
| #define HAVE_FCNTL_H 1 | |
| #define HAVE_IO_H 1 | |
| #define HAVE_LOCALE_H 1 | |
| #if _MSC_VER >= 1800 | |
| #define HAVE_STDBOOL_H 1 | |
| + | #define HAVE_BOOL_T 1 |
| #endif | |
| #define HAVE_SYS_TYPES_H 1 | |
| #define HAVE_SYS_UTIME_H 1 | |
| - | /* ---------------------------------------------------------------- */ |
| - | /* OTHER HEADER INFO */ |
| - | /* ---------------------------------------------------------------- */ |
| - | |
| - | /* Define to 1 if bool is an available type. */ |
| - | #if _MSC_VER >= 1800 |
| - | #define HAVE_BOOL_T 1 |
| - | #endif |
| - | |
| - | /* ---------------------------------------------------------------- */ |
| - | /* FUNCTIONS */ |
| - | /* ---------------------------------------------------------------- */ |
| - | |
| #define HAVE_CLOSESOCKET 1 | |
| #define HAVE_FREEADDRINFO 1 | |
| #define HAVE_GETADDRINFO 1 | |
| @@ -84,30 +70,18 @@ | |
| #define SEND_TYPE_RETV int | |
| #define HAVE_SIGNAL 1 | |
| - | /* ---------------------------------------------------------------- */ |
| - | /* TYPEDEF REPLACEMENTS */ |
| - | /* ---------------------------------------------------------------- */ |
| - | |
| - | /* Define if ssize_t is not an available 'typedefed' type. */ |
| - | #ifndef _SSIZE_T_DEFINED |
| - | #define _SSIZE_T_DEFINED |
| - | #ifdef _WIN64 |
| - | # define ssize_t __int64 |
| - | #else |
| - | # define ssize_t int |
| - | #endif |
| - | #endif |
| - | |
| - | /* ---------------------------------------------------------------- */ |
| - | /* TYPE SIZES */ |
| - | /* ---------------------------------------------------------------- */ |
| + | /* |
| + | * Types and sizes |
| + | */ |
| #define SIZEOF_INT 4 | |
| #define SIZEOF_LONG 4 | |
| #ifdef _WIN64 | |
| # define SIZEOF_SIZE_T 8 | |
| + | # define ssize_t __int64 |
| #else | |
| # define SIZEOF_SIZE_T 4 | |
| + | # define ssize_t int |
| #endif | |
| #define SIZEOF_CURL_OFF_T 8 | |
| /* Default to 64-bit time_t unless _USE_32BIT_TIME_T is defined */ | |
| @@ -118,65 +92,32 @@ | |
| #endif | |
| #define SIZEOF_OFF_T 4 | |
| - | /* ---------------------------------------------------------------- */ |
| - | /* STRUCT RELATED */ |
| - | /* ---------------------------------------------------------------- */ |
| - | |
| - | /* Define if you have struct sockaddr_storage. */ |
| #define HAVE_STRUCT_SOCKADDR_STORAGE 1 | |
| - | |
| - | /* Define if you have struct timeval. */ |
| #define HAVE_STRUCT_TIMEVAL 1 | |
| - | |
| - | /* Define if struct sockaddr_in6 has the sin6_scope_id member. */ |
| #define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1 | |
| - | /* ---------------------------------------------------------------- */ |
| - | /* DNS RESOLVER SPECIALTY */ |
| - | /* ---------------------------------------------------------------- */ |
| - | |
| /* | |
| - | * Undefine both USE_ARES and USE_RESOLV_THREADED for synchronous DNS. |
| + | * Additional definitions |
| */ | |
| /* Default define to enable threaded asynchronous DNS lookups. */ | |
| - | #if !defined(USE_SYNC_DNS) && !defined(USE_ARES) && \ |
| - | !defined(USE_RESOLV_THREADED) |
| + | #if !defined(USE_RESOLV_THREADED) && !defined(USE_SYNC_DNS) |
| # define USE_RESOLV_THREADED 1 | |
| #endif | |
| - | #if defined(USE_ARES) && defined(USE_RESOLV_THREADED) |
| - | # error "Only one DNS lookup specialty may be defined at most" |
| - | #endif |
| - | |
| - | /* ---------------------------------------------------------------- */ |
| - | /* LDAP SUPPORT */ |
| - | /* ---------------------------------------------------------------- */ |
| - | |
| - | #ifndef CURL_WINDOWS_UWP |
| - | #define HAVE_LDAP_SSL 1 |
| + | #define HAVE_LDAP_SSL 1 |
| #define USE_WIN32_LDAP 1 | |
| + | #define USE_WIN32_CRYPTO 1 |
| + | #define USE_UNIX_SOCKETS 1 |
| - | /* Define to use the Windows crypto library. */ |
| - | #define USE_WIN32_CRYPTO |
| - | #endif /* CURL_WINDOWS_UWP */ |
| - | |
| - | /* Define to use Unix sockets. */ |
| - | #define USE_UNIX_SOCKETS |
| - | |
| - | /* ---------------------------------------------------------------- */ |
| - | /* ADDITIONAL DEFINITIONS */ |
| - | /* ---------------------------------------------------------------- */ |
| - | |
| - | /* Define cpu-machine-OS */ |
| #ifndef CURL_OS | |
| - | # ifdef _M_IX86 /* x86 */ |
| + | # ifdef _M_IX86 |
| # define CURL_OS "i386-pc-win32" | |
| - | # elif defined(_M_X64) /* x86_64 */ |
| + | # elif defined(_M_X64) |
| # define CURL_OS "x86_64-pc-win32" | |
| # else | |
| # define CURL_OS "unknown-pc-win32" | |
| # endif | |
| - | #endif /* !CURL_OS */ |
| + | #endif |
| #endif /* HEADER_CURL_CONFIG_WIN32_H */ | |