diff options
Diffstat (limited to 'libcurl/libcurl/curl_config.h')
-rw-r--r-- | libcurl/libcurl/curl_config.h | 106 |
1 files changed, 41 insertions, 65 deletions
diff --git a/libcurl/libcurl/curl_config.h b/libcurl/libcurl/curl_config.h index 3bebb85..2ccc522 100644 --- a/libcurl/libcurl/curl_config.h +++ b/libcurl/libcurl/curl_config.h @@ -47,17 +47,15 @@ #define CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG 1 -#undef HAVE_BORINGSSL #undef USE_WOLFSSL /* Enabled features. */ -#define ENABLE_IPV6 1 -#define HAVE_ZLIB_H 1 -#define HAVE_LIBZ 1 +#define ENABLE_IPV6 1 +#define HAVE_LIBZ 1 +#define USE_WEBSOCKETS 1 #undef CURL_DISABLE_COOKIES -#undef CURL_DISABLE_CRYPTO_AUTH #undef CURL_DISABLE_DICT #undef CURL_DISABLE_DOH #undef CURL_DISABLE_FILE @@ -84,6 +82,17 @@ #undef CURL_DISABLE_GETOPTIONS #undef CURL_DISABLE_MQTT #undef CURL_DISABLE_SOCKETPAIR +#undef CURL_DISABLE_HEADERS_API +#undef CURL_DISABLE_HSTS +#undef CURL_DISABLE_NTLM +#undef CURL_DISABLE_AWS +#undef CURL_DISABLE_BASIC_AUTH +#undef CURL_DISABLE_BEARER_AUTH +#undef CURL_DISABLE_BINDLOCAL +#undef CURL_DISABLE_DIGEST_AUTH +#undef CURL_DISABLE_FORM_API +#undef CURL_DISABLE_KERBEROS_AUTH +#undef CURL_DISABLE_NEGOTIATE_AUTH /* Diabled features. */ @@ -96,29 +105,24 @@ #undef HAVE_LDAP_URL_PARSE #undef USE_LIBSSH #undef USE_LIBSSH2 -#undef HAVE_LIBSSH2_H -#undef HAVE_LIBSSH_LIBSSH_H #undef USE_AMISSL #undef USE_GNUTLS #undef USE_ARES #undef USE_LIBPSL #undef USE_MANUAL #undef USE_MBEDTLS -#undef USE_MESALINK -#undef USE_METALINK #undef USE_NGHTTP2 #undef USE_NGHTTP3 #undef USE_NGTCP2 -#undef USE_NSS #undef USE_OPENLDAP #undef USE_LIBRTMP #undef USE_QUICHE #undef USE_BEARSSL #undef USE_GSASL -#undef USE_HSTS #undef USE_HYPER #undef USE_RUSTLS #undef USE_WOLFSSH +#undef USE_MSH3 /* Specific for (non-) Linux. */ @@ -154,12 +158,14 @@ */ #if defined(__FreeBSD__) || defined(__APPLE__) # define HAVE_SYS_SOCKIO_H 1 +# define HAVE_ARC4RANDOM 1 #endif /* Specific for Linux and Mac OS. */ #if defined(__linux__) || defined(__APPLE__) -# define HAVE_FSETXATTR 1 +# define HAVE_FSETXATTR 1 +# define HAVE_CLOCK_GETTIME_MONOTONIC_RAW 1 #endif /* Specific for POSIX. @@ -176,6 +182,7 @@ # define HAVE_POLL_H 1 # define HAVE_PWD_H 1 # define HAVE_ALARM 1 +# define HAVE_FCNTL 1 # define HAVE_FCNTL_O_NONBLOCK 1 # define HAVE_FNMATCH 1 # define HAVE_GETEUID 1 @@ -202,6 +209,9 @@ # define HAVE_TERMIOS_H 1 # define HAVE_UTIMES 1 # define HAVE_SUSECONDS_T 1 +# define HAVE_FCHMOD 1 +# define HAVE_NETINET_UDP_H 1 +# define HAVE_SENDMSG 1 # define CURL_SA_FAMILY_T sa_family_t # define GETHOSTNAME_TYPE_ARG2 size_t @@ -221,16 +231,13 @@ # define USE_WIN32_LARGE_FILES 1 # define USE_WINDOWS_SSPI 1 -# define WANT_IDN_PROTOTYPES 1 - -# define HAVE_PROCESS_H 1 # define HAVE_CLOSESOCKET 1 # define HAVE_IOCTLSOCKET_FIONBIO 1 # define HAVE_IO_H 1 # define HAVE_SYS_UTIME_H 1 # define HAVE_WINDOWS_H 1 # define HAVE_WINSOCK2_H 1 -# define HAVE_WINSOCK_H 1 +# define HAVE__FSEEKI64 1 # undef _UNICODE # undef UNICODE @@ -277,11 +284,9 @@ # define HAVE_INET_PTON 1 # define HAVE_LIBGEN_H 1 # define HAVE_PTHREAD_H 1 -# define HAVE_SETJMP_H 1 # define HAVE_SIGNAL 1 # define HAVE_STRCASECMP 1 # define HAVE_STRINGS_H 1 -# define HAVE_STRING_H 1 # define HAVE_STRTOK_R 1 # define HAVE_SYS_PARAM_H 1 # define HAVE_SYS_TIME_H 1 @@ -290,8 +295,8 @@ # define HAVE_VARIADIC_MACROS_GCC 1 # define HAVE_OPENSSL_SRP 1 # define HAVE_FTRUNCATE 1 - -# define TIME_WITH_SYS_TIME 1 +# define HAVE_SCHED_YIELD 1 +# define HAVE_FSEEKO 1 #else # define USE_THREADS_WIN32 1 # undef USE_THREADS_POSIX @@ -301,27 +306,21 @@ /* Common for all supported OSes/compilers. */ -#define HAVE_ASSERT_H 1 #define HAVE_STDBOOL_H 1 #define HAVE_BOOL_T 1 -#define HAVE_ERRNO_H 1 #define HAVE_FCNTL_H 1 #define HAVE_WS2TCPIP_H 1 -#define HAVE_SIGNAL_H 1 #define HAVE_LOCALE_H 1 #define HAVE_SETLOCALE 1 #define HAVE_GETADDRINFO 1 #define HAVE_FREEADDRINFO 1 #define HAVE_GETADDRINFO_THREADSAFE 1 -#define HAVE_GETHOSTBYNAME 1 #define HAVE_GETHOSTNAME 1 #define HAVE_GETPEERNAME 1 #define HAVE_GETSOCKNAME 1 #define HAVE_LONGLONG 1 -#define HAVE_OPENSSL_VERSION 1 #define HAVE_SOCKET 1 #define HAVE_SELECT 1 -#define HAVE_SIG_ATOMIC_T 1 #define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1 #define HAVE_STRDUP 1 #define HAVE_STRTOLL 1 @@ -329,11 +328,21 @@ #define HAVE_STRUCT_TIMEVAL 1 #define HAVE_SYS_STAT_H 1 #define HAVE_SYS_TYPES_H 1 -#define HAVE_TIME_H 1 #define HAVE_UTIME 1 #define HAVE_VARIADIC_MACROS_C99 1 +#define HAVE_STRICMP 1 +#define HAVE_SNPRINTF 1 +#define HAVE_STDATOMIC_H 1 +#define HAVE_ATOMIC 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_STDINT_H 1 + +/* SSL_set0_wbio() was added in OpenSSL 1.1.0 and we don't care about earlier + * versions. + */ +#define HAVE_SSL_SET0_WBIO 1 -#define STDC_HEADERS 1 +#define STDC_HEADERS 1 #undef _ALL_SOURCE #undef _LARGE_FILES @@ -346,24 +355,17 @@ #undef HAVE_IDN2_H #undef HAVE_LIBIDN2 #undef HAVE_BROTLI -#undef HAVE_STRUCT_POLLFD #undef HAVE_DECL_GETPWUID_R_MISSING #undef HAVE_GETPASS_R #undef HAVE_GSSAPI #undef HAVE_GSSGNU #undef HAVE_IOCTLSOCKET_CAMEL_FIONBIO #undef HAVE_OLD_GSSMIT -#undef HAVE_PK11_CREATEMANAGEDGENERICOBJECT #undef HAVE_PROTO_BSDSOCKET_H -#undef HAVE_RAND_EGD -#undef HAVE_SETSOCKOPT_SO_NONBLOCK -#undef HAVE_SIG_ATOMIC_T_VOLATILE -#undef HAVE_SSLV2_CLIENT_METHOD #undef HAVE_STRCMPI #undef HAVE_STROPTS_H #undef HAVE_TERMIO_H #undef HAVE_TIME_T_UNSIGNED -#undef HAVE_WOLFSSLV3_CLIENT_METHOD #undef HAVE_WOLFSSL_GET_PEER_CERTIFICATE #undef HAVE_WOLFSSL_USEALPN #undef HAVE_WRITABLE_ARGV @@ -376,44 +378,19 @@ #undef HAVE_CLOSE_S #undef HAVE_EXTRA_STRDUP_H #undef HAVE_EXTRA_STRICMP_H -#undef HAVE_LIBSSH2_VERSION #undef HAVE_SSL_GET_SHUTDOWN -#undef HAVE_VXWORKS_STRERROR_R -#undef RECVFROM_TYPE_ARG6_IS_VOID - -#undef HAVE_GETNAMEINFO -#undef GETNAMEINFO_QUAL_ARG1 -#undef GETNAMEINFO_TYPE_ARG1 -#undef GETNAMEINFO_TYPE_ARG2 -#undef GETNAMEINFO_TYPE_ARG46 -#undef GETNAMEINFO_TYPE_ARG7 - -#undef HAVE_RECVFROM -#undef RECVFROM_TYPE_ARG1 -#undef RECVFROM_TYPE_ARG2 -#undef RECVFROM_TYPE_ARG3 -#undef RECVFROM_TYPE_ARG4 -#undef RECVFROM_TYPE_ARG5 -#undef RECVFROM_TYPE_ARG6 -#undef RECVFROM_TYPE_RETV - -#undef HAVE_ICONV -#undef CURL_ICONV_CODESET_OF_HOST - -#undef NEED_MEMORY_H +#undef HAVE_IOCTLSOCKET_CAMEL +#undef HAVE_WOLFSSL_FULL_BIO + #undef NEED_REENTRANT #undef NEED_THREAD_SAFE -#undef USE_GSKIT #undef USE_OS400CRYPTO #undef BSD -#undef EGD_SOCKET #undef CURLDEBUG #undef DEBUGBUILD #undef ENABLE_QUIC -#undef OPEN_NEEDS_ARG3 -#undef CURL_DOES_CONVERSIONS /* While upstream defines the macro for Clang, it fails to build for older * version of Clang on Mac OS. Thus, we never define it. @@ -501,7 +478,6 @@ */ #define SIZEOF_CURL_OFF_T 8 -#define RETSIGTYPE void #define SEND_QUAL_ARG2 const /* We can probably assume that on platforms we build for, these keywords, @@ -522,6 +498,6 @@ #undef LONG_MAX #undef LONG_MIN -*/ + */ #endif /* LIBCURL_CURL_CONFIG_H */ |