3058ed3df8
Viktor Szakats
2026-02-23
Subject
lib: use lib source directory as base include path
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
.clang-tidy.yml +1 -0lib/CMakeLists.txt +1 -0lib/Makefile.am +1 -0lib/curlx/base64.c +2 -2lib/curlx/basename.c +2 -2lib/curlx/basename.h +1 -1lib/curlx/curlx.h +17 -17lib/curlx/dynbuf.c +3 -3lib/curlx/fopen.c +4 -4lib/curlx/fopen.h +2 -2lib/curlx/inet_ntop.c +4 -4lib/curlx/inet_ntop.h +1 -1lib/curlx/inet_pton.c +3 -3lib/curlx/inet_pton.h +1 -1lib/curlx/multibyte.c +2 -2lib/curlx/multibyte.h +1 -1lib/curlx/nonblock.c +2 -2lib/curlx/strcopy.c +2 -2lib/curlx/strdup.c +2 -2lib/curlx/strdup.h +1 -1lib/curlx/strerr.c +5 -5lib/curlx/strparse.c +1 -1lib/curlx/strparse.h +1 -1lib/curlx/timediff.c +1 -1lib/curlx/timediff.h +1 -1lib/curlx/timeval.c +2 -2lib/curlx/timeval.h +2 -2lib/curlx/version_win32.c +2 -2lib/curlx/version_win32.h +1 -1lib/curlx/wait.c +3 -3lib/curlx/wait.h +1 -1lib/curlx/warnless.c +2 -2lib/curlx/winapi.c +4 -4lib/vauth/cleartext.c +2 -2lib/vauth/cram.c +4 -4lib/vauth/digest.c +9 -9lib/vauth/digest.h +1 -1lib/vauth/digest_sspi.c +8 -8lib/vauth/gsasl.c +3 -3lib/vauth/krb5_gssapi.c +5 -5lib/vauth/krb5_sspi.c +3 -3lib/vauth/ntlm.c +7 -7lib/vauth/ntlm_sspi.c +5 -5lib/vauth/oauth2.c +2 -2lib/vauth/spnego_gssapi.c +5 -5lib/vauth/spnego_sspi.c +5 -5lib/vauth/vauth.c +4 -4lib/vauth/vauth.h +5 -5lib/vquic/curl_ngtcp2.c +27 -27lib/vquic/curl_ngtcp2.h +2 -2lib/vquic/curl_quiche.c +24 -23lib/vquic/curl_quiche.h +1 -1lib/vquic/vquic-tls.c +10 -10lib/vquic/vquic-tls.h +6 -6lib/vquic/vquic.c +16 -16lib/vquic/vquic.h +1 -1lib/vquic/vquic_int.h +2 -2lib/vssh/libssh.c +16 -16lib/vssh/libssh2.c +18 -18lib/vssh/ssh.h +2 -2lib/vssh/vssh.c +6 -6lib/vssh/vssh.h +2 -2lib/vtls/apple.c +6 -6lib/vtls/apple.h +1 -1lib/vtls/cipher_suite.c +2 -2lib/vtls/cipher_suite.h +1 -1lib/vtls/gtls.c +16 -16lib/vtls/gtls.h +3 -2lib/vtls/hostcheck.c +5 -4lib/vtls/hostcheck.h +1 -1lib/vtls/keylog.c +4 -4lib/vtls/keylog.h +1 -1lib/vtls/mbedtls.c +13 -12lib/vtls/mbedtls.h +1 -1lib/vtls/openssl.c +23 -23lib/vtls/openssl.h +2 -2lib/vtls/rustls.c +12 -12lib/vtls/rustls.h +1 -1lib/vtls/schannel.c +20 -20lib/vtls/schannel.h +4 -4lib/vtls/schannel_int.h +3 -3lib/vtls/schannel_verify.c +14 -14lib/vtls/vtls.c +29 -29lib/vtls/vtls.h +2 -2lib/vtls/vtls_int.h +5 -5lib/vtls/vtls_scache.c +16 -16lib/vtls/vtls_scache.h +3 -3lib/vtls/vtls_spack.c +6 -6lib/vtls/vtls_spack.h +1 -1lib/vtls/wolfssl.c +15 -14lib/vtls/wolfssl.h +2 -2lib/vtls/x509asn1.c +7 -7lib/vtls/x509asn1.h +3 -3projects/Windows/tmpl/curl.vcxproj +48 -48src/toolx/tool_time.c +1 -1
.clang-tidy.yml+1 -0
| @@ -17,6 +17,7 @@ Checks: | |
| - misc-const-correctness | |
| - misc-header-include-cycle | |
| - portability-* | |
| + | - readability-duplicate-include |
| - readability-named-parameter | |
| - readability-redundant-control-flow | |
| - readability-redundant-preprocessor | |
lib/CMakeLists.txt+1 -0
| @@ -38,6 +38,7 @@ list(APPEND HHEADERS "${CMAKE_CURRENT_BINARY_DIR}/curl_config.h") | |
| set_property(DIRECTORY APPEND PROPERTY INCLUDE_DIRECTORIES | |
| "${PROJECT_BINARY_DIR}/lib" # for "curl_config.h" | |
| + | "${PROJECT_SOURCE_DIR}/lib" |
| ) | |
| if(CURL_BUILD_TESTING) | |
lib/Makefile.am+1 -0
| @@ -58,6 +58,7 @@ CFLAGS += @CURL_CFLAG_EXTRAS@ | |
| AM_CPPFLAGS = -I$(top_srcdir)/include \ | |
| -I$(top_builddir)/lib \ | |
| + | -I$(top_srcdir)/lib \ |
| -I$(srcdir) | |
| # Prevent LIBS from being used for all link targets | |
lib/curlx/base64.c+2 -2
| @@ -24,9 +24,9 @@ | |
| /* Base64 encoding/decoding */ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| - | #include "base64.h" |
| + | #include "curlx/base64.h" |
| /* ---- Base64 Encoding/Decoding Table --- */ | |
| const char curlx_base64encdec[] = | |
lib/curlx/basename.c+2 -2
| @@ -21,11 +21,11 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifndef HAVE_BASENAME | |
| - | #include "basename.h" |
| + | #include "curlx/basename.h" |
| /* | |
| (Quote from The Open Group Base Specifications Issue 6 IEEE Std 1003.1, 2004 | |
lib/curlx/basename.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifndef HAVE_BASENAME | |
| char *curlx_basename(char *path); | |
lib/curlx/curlx.h+17 -17
| @@ -31,22 +31,22 @@ | |
| * be. | |
| */ | |
| - | #include "base64.h" /* for curlx_base64* */ |
| - | #include "basename.h" /* for curlx_basename() */ |
| - | #include "dynbuf.h" /* for curlx_dyn_*() */ |
| - | #include "fopen.h" /* for curlx_f*() */ |
| - | #include "inet_ntop.h" /* for curlx_inet_ntop() */ |
| - | #include "inet_pton.h" /* for curlx_inet_pton() */ |
| - | #include "multibyte.h" /* for curlx_convert_*() */ |
| - | #include "nonblock.h" /* for curlx_nonblock() */ |
| - | #include "strcopy.h" /* for curlx_strcopy() */ |
| - | #include "strdup.h" /* for curlx_memdup*() and curlx_tcsdup() */ |
| - | #include "strerr.h" /* for curlx_strerror() */ |
| - | #include "strparse.h" /* for curlx_str_* parsing functions */ |
| - | #include "timediff.h" /* for timediff_t type and related functions */ |
| - | #include "timeval.h" /* for curlx_now type and related functions */ |
| - | #include "version_win32.h" /* for curlx_verify_windows_version() */ |
| - | #include "wait.h" /* for curlx_wait_ms() */ |
| - | #include "winapi.h" /* for curlx_winapi_strerror() */ |
| + | #include "curlx/base64.h" /* for curlx_base64* */ |
| + | #include "curlx/basename.h" /* for curlx_basename() */ |
| + | #include "curlx/dynbuf.h" /* for curlx_dyn_*() */ |
| + | #include "curlx/fopen.h" /* for curlx_f*() */ |
| + | #include "curlx/inet_ntop.h" /* for curlx_inet_ntop() */ |
| + | #include "curlx/inet_pton.h" /* for curlx_inet_pton() */ |
| + | #include "curlx/multibyte.h" /* for curlx_convert_*() */ |
| + | #include "curlx/nonblock.h" /* for curlx_nonblock() */ |
| + | #include "curlx/strcopy.h" /* for curlx_strcopy() */ |
| + | #include "curlx/strdup.h" /* for curlx_memdup*() and curlx_tcsdup() */ |
| + | #include "curlx/strerr.h" /* for curlx_strerror() */ |
| + | #include "curlx/strparse.h" /* for curlx_str_* parsing functions */ |
| + | #include "curlx/timediff.h" /* for timediff_t type and related functions */ |
| + | #include "curlx/timeval.h" /* for curlx_now type and related functions */ |
| + | #include "curlx/version_win32.h" /* for curlx_verify_windows_version() */ |
| + | #include "curlx/wait.h" /* for curlx_wait_ms() */ |
| + | #include "curlx/winapi.h" /* for curlx_winapi_strerror() */ |
| #endif /* HEADER_CURL_CURLX_H */ | |
lib/curlx/dynbuf.c+3 -3
| @@ -21,10 +21,10 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| - | #include "dynbuf.h" |
| - | #include "../curl_printf.h" |
| + | #include "curlx/dynbuf.h" |
| + | #include "curl_printf.h" |
| #define MIN_FIRST_ALLOC 32 | |
lib/curlx/fopen.c+4 -4
| @@ -21,9 +21,9 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| - | #include "fopen.h" |
| + | #include "curlx/fopen.h" |
| int curlx_fseek(void *stream, curl_off_t offset, int whence) | |
| { | |
| @@ -42,8 +42,8 @@ int curlx_fseek(void *stream, curl_off_t offset, int whence) | |
| #include <share.h> /* for _SH_DENYNO */ | |
| - | #include "multibyte.h" |
| - | #include "timeval.h" |
| + | #include "curlx/multibyte.h" |
| + | #include "curlx/timeval.h" |
| #ifdef CURL_MEMDEBUG | |
| /* | |
lib/curlx/fopen.h+2 -2
| @@ -23,9 +23,9 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| - | #include "multibyte.h" |
| + | #include "curlx/multibyte.h" |
| #ifdef HAVE_FCNTL_H | |
| #include <fcntl.h> /* for open() and attributes */ | |
lib/curlx/inet_ntop.c+4 -4
| @@ -16,7 +16,7 @@ | |
| * | |
| * SPDX-License-Identifier: ISC | |
| */ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifndef HAVE_INET_NTOP | |
| @@ -30,9 +30,9 @@ | |
| #include <arpa/inet.h> | |
| #endif | |
| - | #include "inet_ntop.h" |
| - | #include "snprintf.h" |
| - | #include "strcopy.h" |
| + | #include "curlx/inet_ntop.h" |
| + | #include "curlx/snprintf.h" |
| + | #include "curlx/strcopy.h" |
| #define IN6ADDRSZ 16 | |
| /* #define INADDRSZ 4 */ | |
lib/curlx/inet_ntop.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef HAVE_INET_NTOP | |
| #ifdef HAVE_NETINET_IN_H | |
lib/curlx/inet_pton.c+3 -3
| @@ -17,7 +17,7 @@ | |
| * | |
| * SPDX-License-Identifier: ISC | |
| */ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifndef HAVE_INET_PTON | |
| @@ -31,8 +31,8 @@ | |
| #include <arpa/inet.h> | |
| #endif | |
| - | #include "inet_pton.h" |
| - | #include "strparse.h" |
| + | #include "curlx/inet_pton.h" |
| + | #include "curlx/strparse.h" |
| #define IN6ADDRSZ 16 | |
| #define INADDRSZ 4 | |
lib/curlx/inet_pton.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef HAVE_INET_PTON | |
| #ifdef HAVE_NETINET_IN_H | |
lib/curlx/multibyte.c+2 -2
| @@ -21,11 +21,11 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(_WIN32) && defined(UNICODE) | |
| - | #include "multibyte.h" |
| + | #include "curlx/multibyte.h" |
| /* | |
| * MultiByte conversions using Windows kernel32 library. | |
lib/curlx/multibyte.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef _WIN32 | |
lib/curlx/nonblock.c+2 -2
| @@ -21,7 +21,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef HAVE_SYS_IOCTL_H | |
| #include <sys/ioctl.h> | |
| @@ -35,7 +35,7 @@ | |
| #include <inet.h> | |
| #endif | |
| - | #include "nonblock.h" |
| + | #include "curlx/nonblock.h" |
| /* | |
| * curlx_nonblock() set the given socket to either blocking or non-blocking | |
lib/curlx/strcopy.c+2 -2
| @@ -21,9 +21,9 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| - | #include "strcopy.h" |
| + | #include "curlx/strcopy.h" |
| /* | |
| * curlx_strcopy() is a replacement for strcpy. | |
lib/curlx/strdup.c+2 -2
| @@ -21,13 +21,13 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef _WIN32 | |
| #include <wchar.h> | |
| #endif | |
| - | #include "strdup.h" |
| + | #include "curlx/strdup.h" |
| #ifdef _WIN32 | |
| /*************************************************************************** | |
lib/curlx/strdup.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef _WIN32 | |
| wchar_t *curlx_wcsdup(const wchar_t *src); /* for curlx_tcsdup() */ | |
lib/curlx/strerr.c+5 -5
| @@ -21,7 +21,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef HAVE_STRERROR_R | |
| # if (!defined(HAVE_POSIX_STRERROR_R) && \ | |
| @@ -31,10 +31,10 @@ | |
| # endif | |
| #endif | |
| - | #include "winapi.h" |
| - | #include "snprintf.h" |
| - | #include "strerr.h" |
| - | #include "strcopy.h" |
| + | #include "curlx/winapi.h" |
| + | #include "curlx/snprintf.h" |
| + | #include "curlx/strerr.h" |
| + | #include "curlx/strcopy.h" |
| #ifdef USE_WINSOCK | |
| /* This is a helper function for curlx_strerror that converts Winsock error | |
lib/curlx/strparse.c+1 -1
| @@ -21,7 +21,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "strparse.h" |
| + | #include "curlx/strparse.h" |
| void curlx_str_init(struct Curl_str *out) | |
| { | |
lib/curlx/strparse.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #define STRE_OK 0 | |
| #define STRE_BIG 1 | |
lib/curlx/timediff.c+1 -1
| @@ -21,7 +21,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "timediff.h" |
| + | #include "curlx/timediff.h" |
| /* | |
| * Converts number of milliseconds into a timeval structure. | |
lib/curlx/timediff.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| /* Use a larger type even for 32-bit time_t systems so that we can keep | |
| microsecond accuracy in it */ | |
lib/curlx/timeval.c+2 -2
| @@ -21,11 +21,11 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "timeval.h" |
| + | #include "curlx/timeval.h" |
| #ifdef _WIN32 | |
| - | #include "../system_win32.h" |
| + | #include "system_win32.h" |
| LARGE_INTEGER Curl_freq; | |
lib/curlx/timeval.h+2 -2
| @@ -23,9 +23,9 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| - | #include "timediff.h" |
| + | #include "curlx/timediff.h" |
| struct curltime { | |
| time_t tv_sec; /* seconds */ | |
lib/curlx/version_win32.c+2 -2
| @@ -21,11 +21,11 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef _WIN32 | |
| - | #include "version_win32.h" |
| + | #include "curlx/version_win32.h" |
| /* This Unicode version struct works for VerifyVersionInfoW (OSVERSIONINFOEXW) | |
| and RtlVerifyVersionInfo (RTLOSVERSIONINFOEXW) */ | |
lib/curlx/version_win32.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef _WIN32 | |
lib/curlx/wait.c+3 -3
| @@ -21,7 +21,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifndef HAVE_SELECT | |
| #error "We cannot compile without select() support." | |
| @@ -37,8 +37,8 @@ | |
| #include <dos.h> /* delay() */ | |
| #endif | |
| - | #include "timediff.h" |
| - | #include "wait.h" |
| + | #include "curlx/timediff.h" |
| + | #include "curlx/wait.h" |
| /* | |
| * Internal function used for waiting a specific amount of ms in | |
lib/curlx/wait.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| int curlx_wait_ms(timediff_t timeout_ms); | |
lib/curlx/warnless.c+2 -2
| @@ -21,9 +21,9 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| - | #include "warnless.h" |
| + | #include "curlx/warnless.h" |
| #if defined(__INTEL_COMPILER) && defined(__unix__) | |
lib/curlx/winapi.c+4 -4
| @@ -21,16 +21,16 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| /* | |
| * curlx_winapi_strerror: | |
| * Variant of curlx_strerror if the error code is definitely Windows API. | |
| */ | |
| #ifdef _WIN32 | |
| - | #include "winapi.h" |
| - | #include "snprintf.h" |
| - | #include "strcopy.h" |
| + | #include "curlx/winapi.h" |
| + | #include "curlx/snprintf.h" |
| + | #include "curlx/strcopy.h" |
| /* This is a helper function for curlx_strerror that converts Windows API error | |
| * codes (GetLastError) to error messages. | |
lib/vauth/cleartext.c+2 -2
| @@ -24,13 +24,13 @@ | |
| * Draft LOGIN SASL Mechanism <draft-murchison-sasl-login-00.txt> | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_SMTP) || \ | |
| !defined(CURL_DISABLE_POP3) || \ | |
| (!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP)) | |
| - | #include "vauth.h" |
| + | #include "vauth/vauth.h" |
| /* | |
| * Curl_auth_create_plain_message() | |
lib/vauth/cram.c+4 -4
| @@ -23,13 +23,13 @@ | |
| * RFC2195 CRAM-MD5 authentication | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifndef CURL_DISABLE_DIGEST_AUTH | |
| - | #include "vauth.h" |
| - | #include "../curl_hmac.h" |
| - | #include "../curl_md5.h" |
| + | #include "vauth/vauth.h" |
| + | #include "curl_hmac.h" |
| + | #include "curl_md5.h" |
| /* | |
| * Curl_auth_create_cram_md5_message() | |
lib/vauth/digest.c+9 -9
| @@ -24,18 +24,18 @@ | |
| * RFC7616 DIGEST-SHA256, DIGEST-SHA512-256 authentication | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifndef CURL_DISABLE_DIGEST_AUTH | |
| - | #include "vauth.h" |
| - | #include "digest.h" |
| - | #include "../curlx/base64.h" |
| - | #include "../curl_md5.h" |
| - | #include "../curl_sha256.h" |
| - | #include "../curl_sha512_256.h" |
| - | #include "../curlx/strparse.h" |
| - | #include "../rand.h" |
| + | #include "vauth/vauth.h" |
| + | #include "vauth/digest.h" |
| + | #include "curlx/base64.h" |
| + | #include "curl_md5.h" |
| + | #include "curl_sha256.h" |
| + | #include "curl_sha512_256.h" |
| + | #include "curlx/strparse.h" |
| + | #include "rand.h" |
| #ifndef USE_WINDOWS_SSPI | |
| #define SESSION_ALGO 1 /* for algos with this bit set */ | |
lib/vauth/digest.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifndef CURL_DISABLE_DIGEST_AUTH | |
lib/vauth/digest_sspi.c+8 -8
| @@ -24,17 +24,17 @@ | |
| * RFC2831 DIGEST-MD5 authentication | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_DIGEST_AUTH) | |
| - | #include "vauth.h" |
| - | #include "digest.h" |
| - | #include "../curlx/multibyte.h" |
| - | #include "../curl_trc.h" |
| - | #include "../curlx/strdup.h" |
| - | #include "../strcase.h" |
| - | #include "../strerror.h" |
| + | #include "vauth/vauth.h" |
| + | #include "vauth/digest.h" |
| + | #include "curlx/multibyte.h" |
| + | #include "curl_trc.h" |
| + | #include "curlx/strdup.h" |
| + | #include "strcase.h" |
| + | #include "strerror.h" |
| /* | |
| * Curl_auth_is_digest_supported() | |
lib/vauth/gsasl.c+3 -3
| @@ -23,12 +23,12 @@ | |
| * RFC5802 SCRAM-SHA-1 authentication | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_GSASL | |
| - | #include "vauth.h" |
| - | #include "../curl_trc.h" |
| + | #include "vauth/vauth.h" |
| + | #include "curl_trc.h" |
| #include <gsasl.h> | |
lib/vauth/krb5_gssapi.c+5 -5
| @@ -24,14 +24,14 @@ | |
| * RFC4752 The Kerberos V5 ("GSSAPI") SASL Mechanism | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(HAVE_GSSAPI) && defined(USE_KERBEROS5) | |
| - | #include "vauth.h" |
| - | #include "../curl_sasl.h" |
| - | #include "../curl_gssapi.h" |
| - | #include "../curl_trc.h" |
| + | #include "vauth/vauth.h" |
| + | #include "curl_sasl.h" |
| + | #include "curl_gssapi.h" |
| + | #include "curl_trc.h" |
| #if defined(__GNUC__) && defined(__APPLE__) | |
| #pragma GCC diagnostic push | |
lib/vauth/krb5_sspi.c+3 -3
| @@ -23,12 +23,12 @@ | |
| * RFC4752 The Kerberos V5 ("GSSAPI") SASL Mechanism | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_WINDOWS_SSPI) && defined(USE_KERBEROS5) | |
| - | #include "vauth.h" |
| - | #include "../curl_trc.h" |
| + | #include "vauth/vauth.h" |
| + | #include "curl_trc.h" |
| /* | |
| * Curl_auth_is_gssapi_supported() | |
lib/vauth/ntlm.c+7 -7
| @@ -21,7 +21,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI) | |
| @@ -34,12 +34,12 @@ | |
| #define DEBUG_ME 0 | |
| - | #include "vauth.h" |
| - | #include "../curl_trc.h" |
| - | #include "../curl_ntlm_core.h" |
| - | #include "../rand.h" |
| - | #include "../curlx/strdup.h" |
| - | #include "../curl_endian.h" |
| + | #include "vauth/vauth.h" |
| + | #include "curl_trc.h" |
| + | #include "curl_ntlm_core.h" |
| + | #include "rand.h" |
| + | #include "curlx/strdup.h" |
| + | #include "curl_endian.h" |
| /* "NTLMSSP" signature is always in ASCII regardless of the platform */ | |
| #define NTLMSSP_SIGNATURE "\x4e\x54\x4c\x4d\x53\x53\x50" | |
lib/vauth/ntlm_sspi.c+5 -5
| @@ -21,14 +21,14 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_WINDOWS_SSPI) && defined(USE_NTLM) | |
| - | #include "vauth.h" |
| - | #include "../curl_ntlm_core.h" |
| - | #include "../curl_trc.h" |
| - | #include "../curlx/strdup.h" |
| + | #include "vauth/vauth.h" |
| + | #include "curl_ntlm_core.h" |
| + | #include "curl_trc.h" |
| + | #include "curlx/strdup.h" |
| /* | |
| * Curl_auth_is_ntlm_supported() | |
lib/vauth/oauth2.c+2 -2
| @@ -23,13 +23,13 @@ | |
| * RFC6749 OAuth 2.0 Authorization Framework | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_SMTP) || \ | |
| !defined(CURL_DISABLE_POP3) || \ | |
| (!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP)) | |
| - | #include "vauth.h" |
| + | #include "vauth/vauth.h" |
| /* | |
| * Curl_auth_create_oauth_bearer_message() | |
lib/vauth/spnego_gssapi.c+5 -5
| @@ -23,14 +23,14 @@ | |
| * RFC4178 Simple and Protected GSS-API Negotiation Mechanism | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(HAVE_GSSAPI) && defined(USE_SPNEGO) | |
| - | #include "vauth.h" |
| - | #include "../curlx/base64.h" |
| - | #include "../curl_gssapi.h" |
| - | #include "../curl_trc.h" |
| + | #include "vauth/vauth.h" |
| + | #include "curlx/base64.h" |
| + | #include "curl_gssapi.h" |
| + | #include "curl_trc.h" |
| #if defined(__GNUC__) && defined(__APPLE__) | |
| #pragma GCC diagnostic push | |
lib/vauth/spnego_sspi.c+5 -5
| @@ -23,14 +23,14 @@ | |
| * RFC4178 Simple and Protected GSS-API Negotiation Mechanism | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_WINDOWS_SSPI) && defined(USE_SPNEGO) | |
| - | #include "vauth.h" |
| - | #include "../curlx/base64.h" |
| - | #include "../curl_trc.h" |
| - | #include "../strerror.h" |
| + | #include "vauth/vauth.h" |
| + | #include "curlx/base64.h" |
| + | #include "curl_trc.h" |
| + | #include "strerror.h" |
| /* | |
| * Curl_auth_is_spnego_supported() | |
lib/vauth/vauth.c+4 -4
| @@ -21,11 +21,11 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| - | #include "vauth.h" |
| - | #include "../curlx/multibyte.h" |
| - | #include "../url.h" |
| + | #include "vauth/vauth.h" |
| + | #include "curlx/multibyte.h" |
| + | #include "url.h" |
| /* | |
| * Curl_auth_build_spn() | |
lib/vauth/vauth.h+5 -5
| @@ -23,11 +23,11 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| - | #include "../bufref.h" |
| - | #include "../curlx/dynbuf.h" |
| - | #include "../urldata.h" |
| + | #include "bufref.h" |
| + | #include "curlx/dynbuf.h" |
| + | #include "urldata.h" |
| struct Curl_easy; | |
| struct connectdata; | |
| @@ -49,7 +49,7 @@ struct gsasldata; | |
| #endif | |
| #ifdef USE_WINDOWS_SSPI | |
| - | #include "../curl_sspi.h" |
| + | #include "curl_sspi.h" |
| #define GSS_ERROR(status) ((status) & 0x80000000) | |
| #endif | |
lib/vquic/curl_ngtcp2.c+27 -27
| @@ -21,7 +21,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if !defined(CURL_DISABLE_HTTP) && defined(USE_NGTCP2) && defined(USE_NGHTTP3) | |
| #include <ngtcp2/ngtcp2.h> | |
| @@ -36,38 +36,38 @@ | |
| #else | |
| #include <ngtcp2/ngtcp2_crypto_quictls.h> | |
| #endif | |
| - | #include "../vtls/openssl.h" |
| + | #include "vtls/openssl.h" |
| #elif defined(USE_GNUTLS) | |
| #include <ngtcp2/ngtcp2_crypto_gnutls.h> | |
| - | #include "../vtls/gtls.h" |
| + | #include "vtls/gtls.h" |
| #elif defined(USE_WOLFSSL) | |
| #include <ngtcp2/ngtcp2_crypto_wolfssl.h> | |
| - | #include "../vtls/wolfssl.h" |
| + | #include "vtls/wolfssl.h" |
| #endif | |
| - | #include "../urldata.h" |
| - | #include "../url.h" |
| - | #include "../uint-hash.h" |
| - | #include "../curl_trc.h" |
| - | #include "../rand.h" |
| - | #include "../multiif.h" |
| - | #include "../cfilters.h" |
| - | #include "../cf-socket.h" |
| - | #include "../connect.h" |
| - | #include "../progress.h" |
| - | #include "../curlx/fopen.h" |
| - | #include "../curlx/dynbuf.h" |
| - | #include "../http1.h" |
| - | #include "../select.h" |
| - | #include "../transfer.h" |
| - | #include "../bufref.h" |
| - | #include "vquic.h" |
| - | #include "vquic_int.h" |
| - | #include "vquic-tls.h" |
| - | #include "../vtls/keylog.h" |
| - | #include "../vtls/vtls.h" |
| - | #include "../vtls/vtls_scache.h" |
| - | #include "curl_ngtcp2.h" |
| + | #include "urldata.h" |
| + | #include "url.h" |
| + | #include "uint-hash.h" |
| + | #include "curl_trc.h" |
| + | #include "rand.h" |
| + | #include "multiif.h" |
| + | #include "cfilters.h" |
| + | #include "cf-socket.h" |
| + | #include "connect.h" |
| + | #include "progress.h" |
| + | #include "curlx/fopen.h" |
| + | #include "curlx/dynbuf.h" |
| + | #include "http1.h" |
| + | #include "select.h" |
| + | #include "transfer.h" |
| + | #include "bufref.h" |
| + | #include "vquic/vquic.h" |
| + | #include "vquic/vquic_int.h" |
| + | #include "vquic/vquic-tls.h" |
| + | #include "vtls/keylog.h" |
| + | #include "vtls/vtls.h" |
| + | #include "vtls/vtls_scache.h" |
| + | #include "vquic/curl_ngtcp2.h" |
| #define QUIC_MAX_STREAMS (256 * 1024) | |
lib/vquic/curl_ngtcp2.h+2 -2
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if !defined(CURL_DISABLE_HTTP) && defined(USE_NGTCP2) && defined(USE_NGHTTP3) | |
| @@ -46,7 +46,7 @@ | |
| struct Curl_cfilter; | |
| - | #include "../urldata.h" |
| + | #include "urldata.h" |
| void Curl_ngtcp2_ver(char *p, size_t len); | |
lib/vquic/curl_quiche.c+24 -23
| @@ -21,34 +21,35 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if !defined(CURL_DISABLE_HTTP) && defined(USE_QUICHE) | |
| #include <quiche.h> | |
| #include <openssl/err.h> | |
| #include <openssl/ssl.h> | |
| - | #include "../bufq.h" |
| - | #include "../uint-hash.h" |
| - | #include "../urldata.h" |
| - | #include "../cfilters.h" |
| - | #include "../cf-socket.h" |
| - | #include "../curl_trc.h" |
| - | #include "../rand.h" |
| - | #include "../multiif.h" |
| - | #include "../connect.h" |
| - | #include "../progress.h" |
| - | #include "../select.h" |
| - | #include "../http1.h" |
| - | #include "vquic.h" |
| - | #include "vquic_int.h" |
| - | #include "vquic-tls.h" |
| - | #include "curl_quiche.h" |
| - | #include "../transfer.h" |
| - | #include "../url.h" |
| - | #include "../bufref.h" |
| - | #include "../vtls/openssl.h" |
| - | #include "../vtls/keylog.h" |
| - | #include "../vtls/vtls.h" |
| + | |
| + | #include "bufq.h" |
| + | #include "uint-hash.h" |
| + | #include "urldata.h" |
| + | #include "cfilters.h" |
| + | #include "cf-socket.h" |
| + | #include "curl_trc.h" |
| + | #include "rand.h" |
| + | #include "multiif.h" |
| + | #include "connect.h" |
| + | #include "progress.h" |
| + | #include "select.h" |
| + | #include "http1.h" |
| + | #include "vquic/vquic.h" |
| + | #include "vquic/vquic_int.h" |
| + | #include "vquic/vquic-tls.h" |
| + | #include "vquic/curl_quiche.h" |
| + | #include "transfer.h" |
| + | #include "url.h" |
| + | #include "bufref.h" |
| + | #include "vtls/openssl.h" |
| + | #include "vtls/keylog.h" |
| + | #include "vtls/vtls.h" |
| /* HTTP/3 error values defined in RFC 9114, ch. 8.1 */ | |
| #define CURL_H3_NO_ERROR 0x0100 | |
lib/vquic/curl_quiche.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if !defined(CURL_DISABLE_HTTP) && defined(USE_QUICHE) | |
lib/vquic/vquic-tls.c+10 -10
| @@ -21,34 +21,34 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_HTTP3) && \ | |
| (defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_WOLFSSL)) | |
| #ifdef USE_OPENSSL | |
| #include <openssl/err.h> | |
| - | #include "../vtls/openssl.h" |
| + | #include "vtls/openssl.h" |
| #elif defined(USE_GNUTLS) | |
| #include <gnutls/abstract.h> | |
| #include <gnutls/gnutls.h> | |
| #include <gnutls/x509.h> | |
| #include <gnutls/crypto.h> | |
| #include <nettle/sha2.h> | |
| - | #include "../vtls/gtls.h" |
| + | #include "vtls/gtls.h" |
| #elif defined(USE_WOLFSSL) | |
| #include <wolfssl/options.h> | |
| #include <wolfssl/ssl.h> | |
| #include <wolfssl/quic.h> | |
| - | #include "../vtls/wolfssl.h" |
| + | #include "vtls/wolfssl.h" |
| #endif | |
| - | #include "../urldata.h" |
| - | #include "../cfilters.h" |
| - | #include "../vtls/keylog.h" |
| - | #include "../vtls/vtls.h" |
| - | #include "../vtls/vtls_scache.h" |
| - | #include "vquic-tls.h" |
| + | #include "urldata.h" |
| + | #include "cfilters.h" |
| + | #include "vtls/keylog.h" |
| + | #include "vtls/vtls.h" |
| + | #include "vtls/vtls_scache.h" |
| + | #include "vquic/vquic-tls.h" |
| CURLcode Curl_vquic_tls_init(struct curl_tls_ctx *ctx, | |
| struct Curl_cfilter *cf, | |
lib/vquic/vquic-tls.h+6 -6
| @@ -23,17 +23,17 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_HTTP3) && \ | |
| (defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_WOLFSSL)) | |
| - | #include "../bufq.h" |
| - | #include "../vtls/vtls.h" |
| - | #include "../vtls/vtls_int.h" |
| + | #include "bufq.h" |
| + | #include "vtls/vtls.h" |
| + | #include "vtls/vtls_int.h" |
| - | #include "../vtls/openssl.h" |
| - | #include "../vtls/wolfssl.h" |
| + | #include "vtls/openssl.h" |
| + | #include "vtls/wolfssl.h" |
| struct ssl_peer; | |
| struct Curl_ssl_session; | |
lib/vquic/vquic.c+16 -16
| @@ -21,11 +21,11 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| - | #include "../urldata.h" |
| - | #include "vquic.h" |
| + | #include "curl_setup.h" |
| + | #include "urldata.h" |
| + | #include "vquic/vquic.h" |
| - | #include "../curl_trc.h" |
| + | #include "curl_trc.h" |
| #if !defined(CURL_DISABLE_HTTP) && defined(USE_HTTP3) | |
| @@ -37,18 +37,18 @@ | |
| #include <nghttp3/nghttp3.h> | |
| #endif | |
| - | #include "../bufq.h" |
| - | #include "../curlx/dynbuf.h" |
| - | #include "../curlx/fopen.h" |
| - | #include "../cfilters.h" |
| - | #include "curl_ngtcp2.h" |
| - | #include "curl_quiche.h" |
| - | #include "../multiif.h" |
| - | #include "../progress.h" |
| - | #include "../rand.h" |
| - | #include "vquic_int.h" |
| - | #include "../curlx/strerr.h" |
| - | #include "../curlx/strparse.h" |
| + | #include "bufq.h" |
| + | #include "curlx/dynbuf.h" |
| + | #include "curlx/fopen.h" |
| + | #include "cfilters.h" |
| + | #include "vquic/curl_ngtcp2.h" |
| + | #include "vquic/curl_quiche.h" |
| + | #include "multiif.h" |
| + | #include "progress.h" |
| + | #include "rand.h" |
| + | #include "vquic/vquic_int.h" |
| + | #include "curlx/strerr.h" |
| + | #include "curlx/strparse.h" |
| #define NW_CHUNK_SIZE (64 * 1024) | |
lib/vquic/vquic.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if !defined(CURL_DISABLE_HTTP) && defined(USE_HTTP3) | |
| struct Curl_cfilter; | |
lib/vquic/vquic_int.h+2 -2
| @@ -23,11 +23,11 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_HTTP3 | |
| - | #include "../bufq.h" |
| + | #include "bufq.h" |
| #define MAX_UDP_PAYLOAD_SIZE 1452 | |
lib/vssh/libssh.c+16 -16
| @@ -24,7 +24,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_LIBSSH | |
| @@ -42,21 +42,21 @@ | |
| #include <inet.h> | |
| #endif | |
| - | #include "../urldata.h" |
| - | #include "../sendf.h" |
| - | #include "../curl_trc.h" |
| - | #include "../hostip.h" |
| - | #include "../progress.h" |
| - | #include "../transfer.h" |
| - | #include "ssh.h" |
| - | #include "../url.h" |
| - | #include "../cfilters.h" |
| - | #include "../connect.h" |
| - | #include "../parsedate.h" /* for the week day and month names */ |
| - | #include "../curlx/strparse.h" |
| - | #include "../multiif.h" |
| - | #include "../select.h" |
| - | #include "vssh.h" |
| + | #include "urldata.h" |
| + | #include "sendf.h" |
| + | #include "curl_trc.h" |
| + | #include "hostip.h" |
| + | #include "progress.h" |
| + | #include "transfer.h" |
| + | #include "vssh/ssh.h" |
| + | #include "url.h" |
| + | #include "cfilters.h" |
| + | #include "connect.h" |
| + | #include "parsedate.h" /* for the week day and month names */ |
| + | #include "curlx/strparse.h" |
| + | #include "multiif.h" |
| + | #include "select.h" |
| + | #include "vssh/vssh.h" |
| #ifdef HAVE_UNISTD_H | |
| #include <unistd.h> | |
lib/vssh/libssh2.c+18 -18
| @@ -21,7 +21,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_LIBSSH2 | |
| @@ -41,23 +41,23 @@ | |
| #include <inet.h> | |
| #endif | |
| - | #include "../urldata.h" |
| - | #include "../sendf.h" |
| - | #include "../curl_trc.h" |
| - | #include "../hostip.h" |
| - | #include "../progress.h" |
| - | #include "../transfer.h" |
| - | #include "ssh.h" |
| - | #include "../url.h" |
| - | #include "../cfilters.h" |
| - | #include "../connect.h" |
| - | #include "../parsedate.h" /* for the week day and month names */ |
| - | #include "../multiif.h" |
| - | #include "../select.h" |
| - | #include "../curlx/fopen.h" |
| - | #include "vssh.h" |
| - | #include "../curlx/strparse.h" |
| - | #include "../curlx/base64.h" /* for base64 encoding/decoding */ |
| + | #include "urldata.h" |
| + | #include "sendf.h" |
| + | #include "curl_trc.h" |
| + | #include "hostip.h" |
| + | #include "progress.h" |
| + | #include "transfer.h" |
| + | #include "vssh/ssh.h" |
| + | #include "url.h" |
| + | #include "cfilters.h" |
| + | #include "connect.h" |
| + | #include "parsedate.h" /* for the week day and month names */ |
| + | #include "multiif.h" |
| + | #include "select.h" |
| + | #include "curlx/fopen.h" |
| + | #include "vssh/vssh.h" |
| + | #include "curlx/strparse.h" |
| + | #include "curlx/base64.h" /* for base64 encoding/decoding */ |
| static const char *sftp_libssh2_strerror(unsigned long err) | |
| { | |
lib/vssh/ssh.h+2 -2
| @@ -23,8 +23,8 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| - | #include "../urldata.h" |
| + | #include "curl_setup.h" |
| + | #include "urldata.h" |
| extern const struct Curl_protocol Curl_protocol_sftp; | |
| extern const struct Curl_protocol Curl_protocol_scp; | |
lib/vssh/vssh.c+6 -6
| @@ -21,15 +21,15 @@ | |
| * SPDX-License-Identifier: curl AND ISC | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| - | #include "ssh.h" |
| + | #include "curl_setup.h" |
| + | #include "vssh/ssh.h" |
| #ifdef USE_SSH | |
| - | #include "vssh.h" |
| - | #include "../curlx/strparse.h" |
| - | #include "../curl_trc.h" |
| - | #include "../escape.h" |
| + | #include "vssh/vssh.h" |
| + | #include "curlx/strparse.h" |
| + | #include "curl_trc.h" |
| + | #include "escape.h" |
| #ifdef CURLVERBOSE | |
| const char *Curl_ssh_statename(sshstate state) | |
lib/vssh/vssh.h+2 -2
| @@ -23,11 +23,11 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_SSH | |
| - | #include "../urldata.h" |
| + | #include "urldata.h" |
| CURLcode Curl_getworkingpath(struct Curl_easy *data, | |
| const char *homedir, | |
lib/vtls/apple.c+6 -6
| @@ -38,15 +38,15 @@ | |
| https://httpd.apache.org/docs/2.0/ssl/ssl_intro.html | |
| */ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_APPLE_SECTRUST | |
| - | #include "../urldata.h" |
| - | #include "../cfilters.h" |
| - | #include "../curl_trc.h" |
| - | #include "vtls.h" |
| - | #include "apple.h" |
| + | #include "urldata.h" |
| + | #include "cfilters.h" |
| + | #include "curl_trc.h" |
| + | #include "vtls/vtls.h" |
| + | #include "vtls/apple.h" |
| #include <Security/Security.h> | |
lib/vtls/apple.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_APPLE_SECTRUST | |
| struct Curl_cfilter; | |
lib/vtls/cipher_suite.c+2 -2
| @@ -21,11 +21,11 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_MBEDTLS) || defined(USE_RUSTLS) | |
| - | #include "cipher_suite.h" |
| + | #include "vtls/cipher_suite.h" |
| /* | |
| * To support the CURLOPT_SSL_CIPHER_LIST option on SSL backends | |
lib/vtls/cipher_suite.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_MBEDTLS) || defined(USE_RUSTLS) | |
lib/vtls/gtls.c+16 -16
| @@ -28,7 +28,7 @@ | |
| * Note: do not use the GnuTLS' *_t variable type names in this source code, | |
| * since they were not present in 1.0.X. | |
| */ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_GNUTLS | |
| @@ -38,21 +38,21 @@ | |
| #include <gnutls/crypto.h> | |
| #include <nettle/sha2.h> | |
| - | #include "../urldata.h" |
| - | #include "../curl_trc.h" |
| - | #include "keylog.h" |
| - | #include "gtls.h" |
| - | #include "vtls.h" |
| - | #include "vtls_int.h" |
| - | #include "vtls_scache.h" |
| - | #include "apple.h" |
| - | #include "../vauth/vauth.h" |
| - | #include "../parsedate.h" |
| - | #include "../connect.h" /* for the connect timeout */ |
| - | #include "../progress.h" |
| - | #include "../curlx/strdup.h" |
| - | #include "../curlx/fopen.h" |
| - | #include "x509asn1.h" |
| + | #include "urldata.h" |
| + | #include "curl_trc.h" |
| + | #include "vtls/keylog.h" |
| + | #include "vtls/gtls.h" |
| + | #include "vtls/vtls.h" |
| + | #include "vtls/vtls_int.h" |
| + | #include "vtls/vtls_scache.h" |
| + | #include "vtls/apple.h" |
| + | #include "vauth/vauth.h" |
| + | #include "parsedate.h" |
| + | #include "connect.h" /* for the connect timeout */ |
| + | #include "progress.h" |
| + | #include "curlx/strdup.h" |
| + | #include "curlx/fopen.h" |
| + | #include "vtls/x509asn1.h" |
| /* Enable GnuTLS debugging by defining GTLSDEBUG */ | |
| #if 0 | |
lib/vtls/gtls.h+3 -2
| @@ -23,12 +23,13 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_GNUTLS | |
| #include <gnutls/gnutls.h> | |
| - | #include "../curlx/timeval.h" |
| + | |
| + | #include "curlx/timeval.h" |
| #ifdef HAVE_GNUTLS_SRP | |
| /* the function exists */ | |
lib/vtls/hostcheck.c+5 -4
| @@ -21,7 +21,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_OPENSSL) || defined(USE_SCHANNEL) | |
| /* these backends use functions from this file */ | |
| @@ -32,9 +32,10 @@ | |
| #ifdef HAVE_NETINET_IN6_H | |
| #include <netinet/in6.h> | |
| #endif | |
| - | #include "../curl_memrchr.h" |
| - | #include "hostcheck.h" |
| - | #include "../hostip.h" |
| + | |
| + | #include "curl_memrchr.h" |
| + | #include "vtls/hostcheck.h" |
| + | #include "hostip.h" |
| /* check the two input strings with given length, but do not | |
| assume they end in nul-bytes */ | |
lib/vtls/hostcheck.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_OPENSSL) || defined(USE_SCHANNEL) | |
lib/vtls/keylog.c+4 -4
| @@ -21,7 +21,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_OPENSSL) || \ | |
| defined(USE_GNUTLS) || \ | |
| @@ -30,9 +30,9 @@ | |
| defined(USE_QUICHE) || \ | |
| defined(USE_RUSTLS) | |
| - | #include "keylog.h" |
| - | #include "../escape.h" |
| - | #include "../curlx/fopen.h" |
| + | #include "vtls/keylog.h" |
| + | #include "escape.h" |
| + | #include "curlx/fopen.h" |
| /* The fp for the open SSLKEYLOGFILE, or NULL if not open */ | |
| static FILE *keylog_file_fp; | |
lib/vtls/keylog.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #define KEYLOG_LABEL_MAXLEN (sizeof("CLIENT_HANDSHAKE_TRAFFIC_SECRET") - 1) | |
lib/vtls/mbedtls.c+13 -12
| @@ -27,7 +27,7 @@ | |
| * but vtls.c should ever call or use these functions. | |
| * | |
| */ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_MBEDTLS | |
| @@ -56,17 +56,18 @@ | |
| #ifdef MBEDTLS_DEBUG | |
| #include <mbedtls/debug.h> | |
| #endif | |
| - | #include "cipher_suite.h" |
| - | #include "../urldata.h" |
| - | #include "../curl_trc.h" |
| - | #include "mbedtls.h" |
| - | #include "vtls.h" |
| - | #include "vtls_int.h" |
| - | #include "vtls_scache.h" |
| - | #include "x509asn1.h" |
| - | #include "../connect.h" /* for the connect timeout */ |
| - | #include "../curlx/strdup.h" |
| - | #include "../curl_sha256.h" |
| + | |
| + | #include "vtls/cipher_suite.h" |
| + | #include "urldata.h" |
| + | #include "curl_trc.h" |
| + | #include "vtls/mbedtls.h" |
| + | #include "vtls/vtls.h" |
| + | #include "vtls/vtls_int.h" |
| + | #include "vtls/vtls_scache.h" |
| + | #include "vtls/x509asn1.h" |
| + | #include "connect.h" /* for the connect timeout */ |
| + | #include "curlx/strdup.h" |
| + | #include "curl_sha256.h" |
| /* ALPN for http2 */ | |
| #if defined(USE_HTTP2) && defined(MBEDTLS_SSL_ALPN) | |
lib/vtls/mbedtls.h+1 -1
| @@ -24,7 +24,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_MBEDTLS | |
lib/vtls/openssl.c+23 -23
| @@ -25,7 +25,7 @@ | |
| * Source file for all OpenSSL-specific code for the TLS/SSL layer. No code | |
| * but vtls.c should ever call or use these functions. | |
| */ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_QUICHE) || defined(USE_OPENSSL) | |
| @@ -62,28 +62,28 @@ | |
| #undef OCSP_RESPONSE | |
| #endif | |
| - | #include "../urldata.h" |
| - | #include "../curl_trc.h" |
| - | #include "../httpsrr.h" |
| - | #include "../formdata.h" /* for the boundary function */ |
| - | #include "../url.h" /* for the ssl config check function */ |
| - | #include "../curlx/inet_pton.h" |
| - | #include "openssl.h" |
| - | #include "../connect.h" |
| - | #include "../progress.h" |
| - | #include "vtls.h" |
| - | #include "vtls_int.h" |
| - | #include "vtls_scache.h" |
| - | #include "../vauth/vauth.h" |
| - | #include "keylog.h" |
| - | #include "hostcheck.h" |
| - | #include "../transfer.h" |
| - | #include "../multiif.h" |
| - | #include "../curlx/strerr.h" |
| - | #include "../curlx/strparse.h" |
| - | #include "../curlx/strcopy.h" |
| - | #include "../curlx/strdup.h" |
| - | #include "apple.h" |
| + | #include "urldata.h" |
| + | #include "curl_trc.h" |
| + | #include "httpsrr.h" |
| + | #include "formdata.h" /* for the boundary function */ |
| + | #include "url.h" /* for the ssl config check function */ |
| + | #include "curlx/inet_pton.h" |
| + | #include "vtls/openssl.h" |
| + | #include "connect.h" |
| + | #include "progress.h" |
| + | #include "vtls/vtls.h" |
| + | #include "vtls/vtls_int.h" |
| + | #include "vtls/vtls_scache.h" |
| + | #include "vauth/vauth.h" |
| + | #include "vtls/keylog.h" |
| + | #include "vtls/hostcheck.h" |
| + | #include "transfer.h" |
| + | #include "multiif.h" |
| + | #include "curlx/strerr.h" |
| + | #include "curlx/strparse.h" |
| + | #include "curlx/strcopy.h" |
| + | #include "curlx/strdup.h" |
| + | #include "vtls/apple.h" |
| #include <openssl/rand.h> | |
| #include <openssl/x509v3.h> | |
lib/vtls/openssl.h+2 -2
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_OPENSSL | |
| /* | |
| @@ -34,7 +34,7 @@ | |
| #include <openssl/ossl_typ.h> | |
| #include <openssl/ssl.h> | |
| - | #include "../urldata.h" |
| + | #include "urldata.h" |
| #if OPENSSL_VERSION_NUMBER >= 0x30000000L | |
| #define HAVE_OPENSSL3 /* non-fork OpenSSL 3.x or later */ | |
lib/vtls/rustls.c+12 -12
| @@ -23,23 +23,23 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_RUSTLS | |
| #include <rustls.h> | |
| - | #include "../curlx/fopen.h" |
| - | #include "../curlx/strerr.h" |
| - | #include "../urldata.h" |
| - | #include "../curl_trc.h" |
| - | #include "../httpsrr.h" |
| - | #include "vtls.h" |
| - | #include "vtls_int.h" |
| - | #include "rustls.h" |
| - | #include "keylog.h" |
| - | #include "cipher_suite.h" |
| - | #include "x509asn1.h" |
| + | #include "curlx/fopen.h" |
| + | #include "curlx/strerr.h" |
| + | #include "urldata.h" |
| + | #include "curl_trc.h" |
| + | #include "httpsrr.h" |
| + | #include "vtls/vtls.h" |
| + | #include "vtls/vtls_int.h" |
| + | #include "vtls/rustls.h" |
| + | #include "vtls/keylog.h" |
| + | #include "vtls/cipher_suite.h" |
| + | #include "vtls/x509asn1.h" |
| struct rustls_ssl_backend_data { | |
| const struct rustls_client_config *config; | |
lib/vtls/rustls.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_RUSTLS | |
lib/vtls/schannel.c+20 -20
| @@ -27,7 +27,7 @@ | |
| * Source file for all Schannel-specific code for the TLS/SSL layer. No code | |
| * but vtls.c should ever call or use these functions. | |
| */ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_SCHANNEL | |
| @@ -35,25 +35,25 @@ | |
| #error "cannot compile Schannel support without SSPI." | |
| #endif | |
| - | #include "schannel.h" |
| - | #include "schannel_int.h" |
| - | #include "vtls.h" |
| - | #include "vtls_int.h" |
| - | #include "vtls_scache.h" |
| - | #include "../curl_trc.h" |
| - | #include "../connect.h" /* for the connect timeout */ |
| - | #include "../curlx/strdup.h" |
| - | #include "../strerror.h" |
| - | #include "../select.h" /* for the socket readiness */ |
| - | #include "../curlx/fopen.h" |
| - | #include "../curlx/multibyte.h" |
| - | #include "x509asn1.h" |
| - | #include "../system_win32.h" |
| - | #include "../curlx/version_win32.h" |
| - | #include "../rand.h" |
| - | #include "../curlx/strparse.h" |
| - | #include "../progress.h" |
| - | #include "../curl_sha256.h" |
| + | #include "vtls/schannel.h" |
| + | #include "vtls/schannel_int.h" |
| + | #include "vtls/vtls.h" |
| + | #include "vtls/vtls_int.h" |
| + | #include "vtls/vtls_scache.h" |
| + | #include "curl_trc.h" |
| + | #include "connect.h" /* for the connect timeout */ |
| + | #include "curlx/strdup.h" |
| + | #include "strerror.h" |
| + | #include "select.h" /* for the socket readiness */ |
| + | #include "curlx/fopen.h" |
| + | #include "curlx/multibyte.h" |
| + | #include "vtls/x509asn1.h" |
| + | #include "system_win32.h" |
| + | #include "curlx/version_win32.h" |
| + | #include "rand.h" |
| + | #include "curlx/strparse.h" |
| + | #include "progress.h" |
| + | #include "curl_sha256.h" |
| /* Some verbose debug messages are wrapped by SCH_DEV() instead of DEBUGF() | |
| * and only shown if CURL_SCHANNEL_DEV_DEBUG was defined at build time. These | |
lib/vtls/schannel.h+4 -4
| @@ -24,15 +24,15 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_SCHANNEL | |
| #include <schannel.h> | |
| - | #include "../curl_sspi.h" |
| - | #include "../cfilters.h" |
| - | #include "../urldata.h" |
| + | #include "curl_sspi.h" |
| + | #include "cfilters.h" |
| + | #include "urldata.h" |
| extern const struct Curl_ssl Curl_ssl_schannel; | |
lib/vtls/schannel_int.h+3 -3
| @@ -24,12 +24,12 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_SCHANNEL | |
| - | #include "vtls.h" |
| - | #include "../curl_sha256.h" |
| + | #include "vtls/vtls.h" |
| + | #include "curl_sha256.h" |
| #if defined(_MSC_VER) && (_MSC_VER < 1700) | |
| /* Workaround for warning: | |
lib/vtls/schannel_verify.c+14 -14
| @@ -27,7 +27,7 @@ | |
| * Source file for Schannel-specific certificate verification. This code should | |
| * only be invoked by code in schannel.c. | |
| */ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_SCHANNEL | |
| @@ -35,19 +35,19 @@ | |
| #error "cannot compile Schannel support without SSPI." | |
| #endif | |
| - | #include "schannel.h" |
| - | #include "schannel_int.h" |
| - | |
| - | #include "../curlx/fopen.h" |
| - | #include "../curlx/inet_pton.h" |
| - | #include "vtls.h" |
| - | #include "vtls_int.h" |
| - | #include "../curl_trc.h" |
| - | #include "../strerror.h" |
| - | #include "../curlx/winapi.h" |
| - | #include "../curlx/multibyte.h" |
| - | #include "hostcheck.h" |
| - | #include "../curlx/version_win32.h" |
| + | #include "vtls/schannel.h" |
| + | #include "vtls/schannel_int.h" |
| + | |
| + | #include "curlx/fopen.h" |
| + | #include "curlx/inet_pton.h" |
| + | #include "vtls/vtls.h" |
| + | #include "vtls/vtls_int.h" |
| + | #include "curl_trc.h" |
| + | #include "strerror.h" |
| + | #include "curlx/winapi.h" |
| + | #include "curlx/multibyte.h" |
| + | #include "vtls/hostcheck.h" |
| + | #include "curlx/version_win32.h" |
| #define BACKEND ((struct schannel_ssl_backend_data *)connssl->backend) | |
lib/vtls/vtls.c+29 -29
| @@ -38,40 +38,40 @@ | |
| https://httpd.apache.org/docs/2.0/ssl/ssl_intro.html | |
| */ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef HAVE_SYS_TYPES_H | |
| #include <sys/types.h> | |
| #endif | |
| - | #include "../urldata.h" |
| - | #include "../cfilters.h" |
| - | |
| - | #include "vtls.h" /* generic SSL protos etc */ |
| - | #include "vtls_int.h" |
| - | #include "vtls_scache.h" |
| - | |
| - | #include "openssl.h" /* OpenSSL versions */ |
| - | #include "gtls.h" /* GnuTLS versions */ |
| - | #include "wolfssl.h" /* wolfSSL versions */ |
| - | #include "schannel.h" /* Schannel SSPI version */ |
| - | #include "mbedtls.h" /* mbedTLS versions */ |
| - | #include "rustls.h" /* Rustls versions */ |
| - | |
| - | #include "../slist.h" |
| - | #include "../curl_trc.h" |
| - | #include "../strcase.h" |
| - | #include "../url.h" |
| - | #include "../progress.h" |
| - | #include "../curlx/fopen.h" |
| - | #include "../curl_sha256.h" |
| - | #include "../curlx/base64.h" |
| - | #include "../curlx/inet_pton.h" |
| - | #include "../connect.h" |
| - | #include "../select.h" |
| - | #include "../setopt.h" |
| - | #include "../curlx/strdup.h" |
| - | #include "../curlx/strcopy.h" |
| + | #include "urldata.h" |
| + | #include "cfilters.h" |
| + | |
| + | #include "vtls/vtls.h" /* generic SSL protos etc */ |
| + | #include "vtls/vtls_int.h" |
| + | #include "vtls/vtls_scache.h" |
| + | |
| + | #include "vtls/openssl.h" /* OpenSSL versions */ |
| + | #include "vtls/gtls.h" /* GnuTLS versions */ |
| + | #include "vtls/wolfssl.h" /* wolfSSL versions */ |
| + | #include "vtls/schannel.h" /* Schannel SSPI version */ |
| + | #include "vtls/mbedtls.h" /* mbedTLS versions */ |
| + | #include "vtls/rustls.h" /* Rustls versions */ |
| + | |
| + | #include "slist.h" |
| + | #include "curl_trc.h" |
| + | #include "strcase.h" |
| + | #include "url.h" |
| + | #include "progress.h" |
| + | #include "curlx/fopen.h" |
| + | #include "curl_sha256.h" |
| + | #include "curlx/base64.h" |
| + | #include "curlx/inet_pton.h" |
| + | #include "connect.h" |
| + | #include "select.h" |
| + | #include "setopt.h" |
| + | #include "curlx/strdup.h" |
| + | #include "curlx/strcopy.h" |
| #ifdef USE_APPLE_SECTRUST | |
| #include <Security/Security.h> | |
lib/vtls/vtls.h+2 -2
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| struct connectdata; | |
| struct ssl_config_data; | |
| @@ -49,7 +49,7 @@ struct dynbuf; | |
| #define SSLSUPP_ISSUERCERT_BLOB (1 << 14) /* CURLOPT_ISSUERCERT_BLOB */ | |
| #ifdef USE_ECH | |
| - | #include "../curlx/base64.h" |
| + | #include "curlx/base64.h" |
| #define ECH_ENABLED(__data__) \ | |
| (__data__->set.tls_ech && !(__data__->set.tls_ech & CURLECH_DISABLE)) | |
| #endif /* USE_ECH */ | |
lib/vtls/vtls_int.h+5 -5
| @@ -23,14 +23,14 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_SSL | |
| - | #include "../cfilters.h" |
| - | #include "../select.h" |
| - | #include "../urldata.h" |
| - | #include "vtls.h" |
| + | #include "cfilters.h" |
| + | #include "select.h" |
| + | #include "urldata.h" |
| + | #include "vtls/vtls.h" |
| struct Curl_ssl; | |
| struct ssl_connect_data; | |
lib/vtls/vtls_scache.c+16 -16
| @@ -21,7 +21,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_SSL | |
| @@ -29,21 +29,21 @@ | |
| #include <sys/types.h> | |
| #endif | |
| - | #include "../urldata.h" |
| - | #include "../cfilters.h" |
| - | |
| - | #include "vtls.h" /* generic SSL protos etc */ |
| - | #include "vtls_int.h" |
| - | #include "vtls_scache.h" |
| - | #include "vtls_spack.h" |
| - | |
| - | #include "../strcase.h" |
| - | #include "../url.h" |
| - | #include "../llist.h" |
| - | #include "../curl_share.h" |
| - | #include "../curl_trc.h" |
| - | #include "../curl_sha256.h" |
| - | #include "../rand.h" |
| + | #include "urldata.h" |
| + | #include "cfilters.h" |
| + | |
| + | #include "vtls/vtls.h" /* generic SSL protos etc */ |
| + | #include "vtls/vtls_int.h" |
| + | #include "vtls/vtls_scache.h" |
| + | #include "vtls/vtls_spack.h" |
| + | |
| + | #include "strcase.h" |
| + | #include "url.h" |
| + | #include "llist.h" |
| + | #include "curl_share.h" |
| + | #include "curl_trc.h" |
| + | #include "curl_sha256.h" |
| + | #include "rand.h" |
| /* a peer+tls-config we cache sessions for */ | |
lib/vtls/vtls_scache.h+3 -3
| @@ -23,12 +23,12 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_SSL | |
| - | #include "../cfilters.h" |
| - | #include "../urldata.h" |
| + | #include "cfilters.h" |
| + | #include "urldata.h" |
| struct Curl_cfilter; | |
| struct Curl_easy; | |
lib/vtls/vtls_spack.c+6 -6
| @@ -21,15 +21,15 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_SSL) && defined(USE_SSLS_EXPORT) | |
| - | #include "../urldata.h" |
| - | #include "../curl_trc.h" |
| - | #include "vtls_scache.h" |
| - | #include "vtls_spack.h" |
| - | #include "../curlx/strdup.h" |
| + | #include "urldata.h" |
| + | #include "curl_trc.h" |
| + | #include "vtls/vtls_scache.h" |
| + | #include "vtls/vtls_spack.h" |
| + | #include "curlx/strdup.h" |
| #ifndef UINT16_MAX | |
| #define UINT16_MAX 0xffff | |
lib/vtls/vtls_spack.h+1 -1
| @@ -23,7 +23,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_SSL) && defined(USE_SSLS_EXPORT) | |
lib/vtls/wolfssl.c+15 -14
| @@ -26,7 +26,7 @@ | |
| * but vtls.c should ever call or use these functions. | |
| * | |
| */ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_WOLFSSL | |
| @@ -50,22 +50,23 @@ | |
| #endif | |
| #endif | |
| - | #include "../urldata.h" |
| - | #include "../curl_trc.h" |
| - | #include "../httpsrr.h" |
| - | #include "vtls.h" |
| - | #include "vtls_int.h" |
| - | #include "vtls_scache.h" |
| - | #include "keylog.h" |
| - | #include "../connect.h" /* for the connect timeout */ |
| - | #include "../progress.h" |
| - | #include "../curlx/strdup.h" |
| - | #include "../curlx/strcopy.h" |
| - | #include "x509asn1.h" |
| + | #include "urldata.h" |
| + | #include "curl_trc.h" |
| + | #include "httpsrr.h" |
| + | #include "vtls/vtls.h" |
| + | #include "vtls/vtls_int.h" |
| + | #include "vtls/vtls_scache.h" |
| + | #include "vtls/keylog.h" |
| + | #include "connect.h" /* for the connect timeout */ |
| + | #include "progress.h" |
| + | #include "curlx/strdup.h" |
| + | #include "curlx/strcopy.h" |
| + | #include "vtls/x509asn1.h" |
| #include <wolfssl/ssl.h> | |
| #include <wolfssl/error-ssl.h> | |
| - | #include "wolfssl.h" |
| + | |
| + | #include "vtls/wolfssl.h" |
| /* KEEP_PEER_CERT is a product of the presence of build time symbol | |
| OPENSSL_EXTRA without NO_CERTS, depending on the version. KEEP_PEER_CERT is | |
lib/vtls/wolfssl.h+2 -2
| @@ -23,11 +23,11 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #ifdef USE_WOLFSSL | |
| - | #include "../urldata.h" |
| + | #include "urldata.h" |
| struct alpn_spec; | |
| struct ssl_peer; | |
lib/vtls/x509asn1.c+7 -7
| @@ -21,7 +21,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_GNUTLS) || defined(USE_WOLFSSL) || defined(USE_SCHANNEL) || \ | |
| defined(USE_MBEDTLS) || defined(USE_RUSTLS) | |
| @@ -36,12 +36,12 @@ | |
| #define WANT_EXTRACT_CERTINFO /* uses Curl_extract_certinfo() */ | |
| #endif | |
| - | #include "../urldata.h" |
| - | #include "vtls.h" |
| - | #include "../curl_trc.h" |
| - | #include "../curlx/base64.h" |
| - | #include "x509asn1.h" |
| - | #include "../curlx/dynbuf.h" |
| + | #include "urldata.h" |
| + | #include "vtls/vtls.h" |
| + | #include "curl_trc.h" |
| + | #include "curlx/base64.h" |
| + | #include "vtls/x509asn1.h" |
| + | #include "curlx/dynbuf.h" |
| /* | |
| * Constants. | |
lib/vtls/x509asn1.h+3 -3
| @@ -24,13 +24,13 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "../curl_setup.h" |
| + | #include "curl_setup.h" |
| #if defined(USE_GNUTLS) || defined(USE_WOLFSSL) || defined(USE_SCHANNEL) || \ | |
| defined(USE_MBEDTLS) || defined(USE_RUSTLS) | |
| - | #include "../cfilters.h" |
| - | #include "../urldata.h" |
| + | #include "cfilters.h" |
| + | #include "urldata.h" |
| /* | |
| * Types. | |
projects/Windows/tmpl/curl.vcxproj+48 -48
| @@ -839,7 +839,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -869,7 +869,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -898,7 +898,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -928,7 +928,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -956,7 +956,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -988,7 +988,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1019,7 +1019,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1051,7 +1051,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1082,7 +1082,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1114,7 +1114,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1145,7 +1145,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1176,7 +1176,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1208,7 +1208,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1240,7 +1240,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1272,7 +1272,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -1302,7 +1302,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -1331,7 +1331,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -1360,7 +1360,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -1390,7 +1390,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -1420,7 +1420,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -1448,7 +1448,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1480,7 +1480,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1512,7 +1512,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -1542,7 +1542,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -1570,7 +1570,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1602,7 +1602,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1634,7 +1634,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -1664,7 +1664,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -1692,7 +1692,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1724,7 +1724,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1756,7 +1756,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -1786,7 +1786,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -1814,7 +1814,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1846,7 +1846,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1878,7 +1878,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -1908,7 +1908,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -1936,7 +1936,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -1968,7 +1968,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -2000,7 +2000,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -2030,7 +2030,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -2058,7 +2058,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -2089,7 +2089,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -2121,7 +2121,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -2153,7 +2153,7 @@ | |
| </Midl> | |
| <ClCompile> | |
| <Optimization>Disabled</Optimization> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>_DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <MinimalRebuild>true</MinimalRebuild> | |
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
| @@ -2185,7 +2185,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -2214,7 +2214,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -2244,7 +2244,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
| @@ -2274,7 +2274,7 @@ | |
| <ClCompile> | |
| <Optimization>MaxSpeed</Optimization> | |
| <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
| - | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + | <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| <PreprocessorDefinitions>NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
| <StringPooling>true</StringPooling> | |
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | |
src/toolx/tool_time.c+1 -1
| @@ -21,7 +21,7 @@ | |
| * SPDX-License-Identifier: curl | |
| * | |
| ***************************************************************************/ | |
| - | #include "tool_time.h" |
| + | #include "toolx/tool_time.h" |
| #if defined(__MINGW32__) && (__MINGW64_VERSION_MAJOR <= 3) | |
| #include <sec_api/time_s.h> /* for _localtime32_s(), _localtime64_s() */ | |