From 3058ed3df873c21ebba2007c3b12ed9f37558bfe Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 19 Feb 2026 00:44:43 +0100 Subject: [PATCH] lib: use lib source directory as base include path Backtrack on previous change that aimed to solve the wrong `share.h` being included. It turns out it did not fix this issue. At the same time it introduced relative header filenames and the need to include the same headers differently depending on the source files' location, reducing readability and editability. Replace this method by re-adding curl's lib source directory to the header path and addressing headers by the their full, relative name to that base directory. Aligning with this method already used in src and tests. With these advantages: - makes includes easier to read, recognize, grep, sort, write, and copy between sources, - syncs the way these headers are included across curl components, - avoids the ambiguity between system `schannel.h`, `rustls.h` vs. local headers using the same names in `lib/vtls`, - silences clang-tidy `readability-duplicate-include` checker, which detects the above issue, Ref: https://clang.llvm.org/extra/clang-tidy/checks/readability/duplicate-include.html - possibly silences TIOBE coding standard warnings: `6.10.2.a: Don't use relative paths in #include statements.` - long shot: it works well with concatenated test sources, for clang-tidy-friendly custom unity builds. Ref: #20667 Slight downside: it's not enforced. If there happens to be a collision between a local `lib/*.h` header and a system one, the solution is to rename (possibly with its `.c` counterpart) into the `curl_` namespace. This is also the method used by curl in the past. Also: - curlx/inet_pton: reduce scope of an include. - toolx/tool_time: apply this to an include, and update VS project files accordingly. Also dropping unnecessary lib/curlx header path. - clang-tidy: enable `readability-duplicate-include`. Follow-up to 3887069c661b40e76b053a4867eb565d4761ab3e #19676 Follow-up to 625f2c1644da58b9617479775badea21f125ce6d #16991 #16949 Closes #20623 --- .clang-tidy.yml | 1 + lib/CMakeLists.txt | 1 + lib/Makefile.am | 1 + lib/curlx/base64.c | 4 +- lib/curlx/basename.c | 4 +- lib/curlx/basename.h | 2 +- lib/curlx/curlx.h | 34 +++++------ lib/curlx/dynbuf.c | 6 +- lib/curlx/fopen.c | 8 +-- lib/curlx/fopen.h | 4 +- lib/curlx/inet_ntop.c | 8 +-- lib/curlx/inet_ntop.h | 2 +- lib/curlx/inet_pton.c | 6 +- lib/curlx/inet_pton.h | 2 +- lib/curlx/multibyte.c | 4 +- lib/curlx/multibyte.h | 2 +- lib/curlx/nonblock.c | 4 +- lib/curlx/strcopy.c | 4 +- lib/curlx/strdup.c | 4 +- lib/curlx/strdup.h | 2 +- lib/curlx/strerr.c | 10 ++-- lib/curlx/strparse.c | 2 +- lib/curlx/strparse.h | 2 +- lib/curlx/timediff.c | 2 +- lib/curlx/timediff.h | 2 +- lib/curlx/timeval.c | 4 +- lib/curlx/timeval.h | 4 +- lib/curlx/version_win32.c | 4 +- lib/curlx/version_win32.h | 2 +- lib/curlx/wait.c | 6 +- lib/curlx/wait.h | 2 +- lib/curlx/warnless.c | 4 +- lib/curlx/winapi.c | 8 +-- lib/vauth/cleartext.c | 4 +- lib/vauth/cram.c | 8 +-- lib/vauth/digest.c | 18 +++--- lib/vauth/digest.h | 2 +- lib/vauth/digest_sspi.c | 16 ++--- lib/vauth/gsasl.c | 6 +- lib/vauth/krb5_gssapi.c | 10 ++-- lib/vauth/krb5_sspi.c | 6 +- lib/vauth/ntlm.c | 14 ++--- lib/vauth/ntlm_sspi.c | 10 ++-- lib/vauth/oauth2.c | 4 +- lib/vauth/spnego_gssapi.c | 10 ++-- lib/vauth/spnego_sspi.c | 10 ++-- lib/vauth/vauth.c | 8 +-- lib/vauth/vauth.h | 10 ++-- lib/vquic/curl_ngtcp2.c | 54 ++++++++--------- lib/vquic/curl_ngtcp2.h | 4 +- lib/vquic/curl_quiche.c | 47 ++++++++------- lib/vquic/curl_quiche.h | 2 +- lib/vquic/vquic-tls.c | 20 +++---- lib/vquic/vquic-tls.h | 12 ++-- lib/vquic/vquic.c | 32 +++++----- lib/vquic/vquic.h | 2 +- lib/vquic/vquic_int.h | 4 +- lib/vssh/libssh.c | 32 +++++----- lib/vssh/libssh2.c | 36 +++++------ lib/vssh/ssh.h | 4 +- lib/vssh/vssh.c | 12 ++-- lib/vssh/vssh.h | 4 +- lib/vtls/apple.c | 12 ++-- lib/vtls/apple.h | 2 +- lib/vtls/cipher_suite.c | 4 +- lib/vtls/cipher_suite.h | 2 +- lib/vtls/gtls.c | 32 +++++----- lib/vtls/gtls.h | 5 +- lib/vtls/hostcheck.c | 9 +-- lib/vtls/hostcheck.h | 2 +- lib/vtls/keylog.c | 8 +-- lib/vtls/keylog.h | 2 +- lib/vtls/mbedtls.c | 25 ++++---- lib/vtls/mbedtls.h | 2 +- lib/vtls/openssl.c | 46 +++++++------- lib/vtls/openssl.h | 4 +- lib/vtls/rustls.c | 24 ++++---- lib/vtls/rustls.h | 2 +- lib/vtls/schannel.c | 40 ++++++------- lib/vtls/schannel.h | 8 +-- lib/vtls/schannel_int.h | 6 +- lib/vtls/schannel_verify.c | 26 ++++---- lib/vtls/vtls.c | 52 ++++++++-------- lib/vtls/vtls.h | 4 +- lib/vtls/vtls_int.h | 10 ++-- lib/vtls/vtls_scache.c | 28 ++++----- lib/vtls/vtls_scache.h | 6 +- lib/vtls/vtls_spack.c | 12 ++-- lib/vtls/vtls_spack.h | 2 +- lib/vtls/wolfssl.c | 29 ++++----- lib/vtls/wolfssl.h | 4 +- lib/vtls/x509asn1.c | 14 ++--- lib/vtls/x509asn1.h | 6 +- projects/Windows/tmpl/curl.vcxproj | 96 +++++++++++++++--------------- src/toolx/tool_time.c | 2 +- 95 files changed, 545 insertions(+), 537 deletions(-) diff --git a/.clang-tidy.yml b/.clang-tidy.yml index 83068685a8..25eb4ee9e9 100644 --- a/.clang-tidy.yml +++ b/.clang-tidy.yml @@ -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 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 2b601673a2..a9307f8011 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -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) diff --git a/lib/Makefile.am b/lib/Makefile.am index 41db1a21ac..ab575ae730 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -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 diff --git a/lib/curlx/base64.c b/lib/curlx/base64.c index 0e44eae7fa..d869975e67 100644 --- a/lib/curlx/base64.c +++ b/lib/curlx/base64.c @@ -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[] = diff --git a/lib/curlx/basename.c b/lib/curlx/basename.c index 27c29f3c00..d2fd160ff2 100644 --- a/lib/curlx/basename.c +++ b/lib/curlx/basename.c @@ -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 diff --git a/lib/curlx/basename.h b/lib/curlx/basename.h index 287a14aa14..fb79fed805 100644 --- a/lib/curlx/basename.h +++ b/lib/curlx/basename.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifndef HAVE_BASENAME char *curlx_basename(char *path); diff --git a/lib/curlx/curlx.h b/lib/curlx/curlx.h index 1ee35fa1a0..79cffc8f6d 100644 --- a/lib/curlx/curlx.h +++ b/lib/curlx/curlx.h @@ -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 */ diff --git a/lib/curlx/dynbuf.c b/lib/curlx/dynbuf.c index a96b2a5974..7045a1f294 100644 --- a/lib/curlx/dynbuf.c +++ b/lib/curlx/dynbuf.c @@ -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 diff --git a/lib/curlx/fopen.c b/lib/curlx/fopen.c index b73d4f94a1..7f16bdb07e 100644 --- a/lib/curlx/fopen.c +++ b/lib/curlx/fopen.c @@ -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 /* for _SH_DENYNO */ -#include "multibyte.h" -#include "timeval.h" +#include "curlx/multibyte.h" +#include "curlx/timeval.h" #ifdef CURL_MEMDEBUG /* diff --git a/lib/curlx/fopen.h b/lib/curlx/fopen.h index c4af828d81..d89830edd3 100644 --- a/lib/curlx/fopen.h +++ b/lib/curlx/fopen.h @@ -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 /* for open() and attributes */ diff --git a/lib/curlx/inet_ntop.c b/lib/curlx/inet_ntop.c index 0b10e8a7f6..803b9887ac 100644 --- a/lib/curlx/inet_ntop.c +++ b/lib/curlx/inet_ntop.c @@ -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 #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 */ diff --git a/lib/curlx/inet_ntop.h b/lib/curlx/inet_ntop.h index d57b217c96..2e3419f02b 100644 --- a/lib/curlx/inet_ntop.h +++ b/lib/curlx/inet_ntop.h @@ -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 diff --git a/lib/curlx/inet_pton.c b/lib/curlx/inet_pton.c index 41a84a4e54..ce324e6d88 100644 --- a/lib/curlx/inet_pton.c +++ b/lib/curlx/inet_pton.c @@ -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 #endif -#include "inet_pton.h" -#include "strparse.h" +#include "curlx/inet_pton.h" +#include "curlx/strparse.h" #define IN6ADDRSZ 16 #define INADDRSZ 4 diff --git a/lib/curlx/inet_pton.h b/lib/curlx/inet_pton.h index fc3ae3d2bb..601bdf8d87 100644 --- a/lib/curlx/inet_pton.h +++ b/lib/curlx/inet_pton.h @@ -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 diff --git a/lib/curlx/multibyte.c b/lib/curlx/multibyte.c index 529091ad92..715d2b8dc2 100644 --- a/lib/curlx/multibyte.c +++ b/lib/curlx/multibyte.c @@ -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. diff --git a/lib/curlx/multibyte.h b/lib/curlx/multibyte.h index 26da0f0843..8863fb0249 100644 --- a/lib/curlx/multibyte.h +++ b/lib/curlx/multibyte.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifdef _WIN32 diff --git a/lib/curlx/nonblock.c b/lib/curlx/nonblock.c index 96bf3db64e..6f6458f2b3 100644 --- a/lib/curlx/nonblock.c +++ b/lib/curlx/nonblock.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifdef HAVE_SYS_IOCTL_H #include @@ -35,7 +35,7 @@ #include #endif -#include "nonblock.h" +#include "curlx/nonblock.h" /* * curlx_nonblock() set the given socket to either blocking or non-blocking diff --git a/lib/curlx/strcopy.c b/lib/curlx/strcopy.c index d6bff15330..da137c3f92 100644 --- a/lib/curlx/strcopy.c +++ b/lib/curlx/strcopy.c @@ -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. diff --git a/lib/curlx/strdup.c b/lib/curlx/strdup.c index 75e088fe4c..3c967dbe0a 100644 --- a/lib/curlx/strdup.c +++ b/lib/curlx/strdup.c @@ -21,13 +21,13 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifdef _WIN32 #include #endif -#include "strdup.h" +#include "curlx/strdup.h" #ifdef _WIN32 /*************************************************************************** diff --git a/lib/curlx/strdup.h b/lib/curlx/strdup.h index 3e17fdee63..0c4b14161e 100644 --- a/lib/curlx/strdup.h +++ b/lib/curlx/strdup.h @@ -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() */ diff --git a/lib/curlx/strerr.c b/lib/curlx/strerr.c index d9c1686e44..e3e838d8c0 100644 --- a/lib/curlx/strerr.c +++ b/lib/curlx/strerr.c @@ -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 diff --git a/lib/curlx/strparse.c b/lib/curlx/strparse.c index 83ff8c904c..8a2523fe79 100644 --- a/lib/curlx/strparse.c +++ b/lib/curlx/strparse.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "strparse.h" +#include "curlx/strparse.h" void curlx_str_init(struct Curl_str *out) { diff --git a/lib/curlx/strparse.h b/lib/curlx/strparse.h index eb3d491595..514203dc92 100644 --- a/lib/curlx/strparse.h +++ b/lib/curlx/strparse.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #define STRE_OK 0 #define STRE_BIG 1 diff --git a/lib/curlx/timediff.c b/lib/curlx/timediff.c index 694c8d8352..2bf786941d 100644 --- a/lib/curlx/timediff.c +++ b/lib/curlx/timediff.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "timediff.h" +#include "curlx/timediff.h" /* * Converts number of milliseconds into a timeval structure. diff --git a/lib/curlx/timediff.h b/lib/curlx/timediff.h index e19b0f4403..1081c75d1c 100644 --- a/lib/curlx/timediff.h +++ b/lib/curlx/timediff.h @@ -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 */ diff --git a/lib/curlx/timeval.c b/lib/curlx/timeval.c index d01884f7fe..0f0883d74a 100644 --- a/lib/curlx/timeval.c +++ b/lib/curlx/timeval.c @@ -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; diff --git a/lib/curlx/timeval.h b/lib/curlx/timeval.h index 4aab17519d..c01f95d87d 100644 --- a/lib/curlx/timeval.h +++ b/lib/curlx/timeval.h @@ -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 */ diff --git a/lib/curlx/version_win32.c b/lib/curlx/version_win32.c index a9a4ee38f9..2aa2641854 100644 --- a/lib/curlx/version_win32.c +++ b/lib/curlx/version_win32.c @@ -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) */ diff --git a/lib/curlx/version_win32.h b/lib/curlx/version_win32.h index a5fb8ff3c2..569626afc8 100644 --- a/lib/curlx/version_win32.h +++ b/lib/curlx/version_win32.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifdef _WIN32 diff --git a/lib/curlx/wait.c b/lib/curlx/wait.c index 2a9f54bb3e..eaf454c122 100644 --- a/lib/curlx/wait.c +++ b/lib/curlx/wait.c @@ -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 /* 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 diff --git a/lib/curlx/wait.h b/lib/curlx/wait.h index c140194a8c..9b9c27386e 100644 --- a/lib/curlx/wait.h +++ b/lib/curlx/wait.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" int curlx_wait_ms(timediff_t timeout_ms); diff --git a/lib/curlx/warnless.c b/lib/curlx/warnless.c index 91b194042f..5fc36ac9a8 100644 --- a/lib/curlx/warnless.c +++ b/lib/curlx/warnless.c @@ -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__) diff --git a/lib/curlx/winapi.c b/lib/curlx/winapi.c index c0d6b7f861..3417df269e 100644 --- a/lib/curlx/winapi.c +++ b/lib/curlx/winapi.c @@ -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. diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c index d9b11d3cb3..7976adec9c 100644 --- a/lib/vauth/cleartext.c +++ b/lib/vauth/cleartext.c @@ -24,13 +24,13 @@ * Draft LOGIN SASL Mechanism * ***************************************************************************/ -#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() diff --git a/lib/vauth/cram.c b/lib/vauth/cram.c index 0d061ebbb0..d3f2d137b7 100644 --- a/lib/vauth/cram.c +++ b/lib/vauth/cram.c @@ -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() diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c index ec82564d2c..1a5f6ffde2 100644 --- a/lib/vauth/digest.c +++ b/lib/vauth/digest.c @@ -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 */ diff --git a/lib/vauth/digest.h b/lib/vauth/digest.h index 902ffab153..5b8f3ae767 100644 --- a/lib/vauth/digest.h +++ b/lib/vauth/digest.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_DIGEST_AUTH diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c index 893838d2cd..f29e569cd1 100644 --- a/lib/vauth/digest_sspi.c +++ b/lib/vauth/digest_sspi.c @@ -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() diff --git a/lib/vauth/gsasl.c b/lib/vauth/gsasl.c index b95d6e3f0a..958f4ffab7 100644 --- a/lib/vauth/gsasl.c +++ b/lib/vauth/gsasl.c @@ -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 diff --git a/lib/vauth/krb5_gssapi.c b/lib/vauth/krb5_gssapi.c index 6a9f182864..dec9eacc49 100644 --- a/lib/vauth/krb5_gssapi.c +++ b/lib/vauth/krb5_gssapi.c @@ -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 diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c index 7aad4badfa..91dd525a5f 100644 --- a/lib/vauth/krb5_sspi.c +++ b/lib/vauth/krb5_sspi.c @@ -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() diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c index 385f6a10b3..205ce6c06d 100644 --- a/lib/vauth/ntlm.c +++ b/lib/vauth/ntlm.c @@ -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" diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c index e0a0bebec3..12cf32b894 100644 --- a/lib/vauth/ntlm_sspi.c +++ b/lib/vauth/ntlm_sspi.c @@ -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() diff --git a/lib/vauth/oauth2.c b/lib/vauth/oauth2.c index a7a061337f..4541d1d551 100644 --- a/lib/vauth/oauth2.c +++ b/lib/vauth/oauth2.c @@ -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() diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c index b1ec37cb31..af8498bad3 100644 --- a/lib/vauth/spnego_gssapi.c +++ b/lib/vauth/spnego_gssapi.c @@ -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 diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c index 12bdc3afd7..1f73123a0d 100644 --- a/lib/vauth/spnego_sspi.c +++ b/lib/vauth/spnego_sspi.c @@ -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() diff --git a/lib/vauth/vauth.c b/lib/vauth/vauth.c index bdf194b995..a00078fce1 100644 --- a/lib/vauth/vauth.c +++ b/lib/vauth/vauth.c @@ -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() diff --git a/lib/vauth/vauth.h b/lib/vauth/vauth.h index 1649dc6832..3e66c89cb5 100644 --- a/lib/vauth/vauth.h +++ b/lib/vauth/vauth.h @@ -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 diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c index d2f704f3db..123eb19b3d 100644 --- a/lib/vquic/curl_ngtcp2.c +++ b/lib/vquic/curl_ngtcp2.c @@ -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 @@ -36,38 +36,38 @@ #else #include #endif -#include "../vtls/openssl.h" +#include "vtls/openssl.h" #elif defined(USE_GNUTLS) #include -#include "../vtls/gtls.h" +#include "vtls/gtls.h" #elif defined(USE_WOLFSSL) #include -#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) diff --git a/lib/vquic/curl_ngtcp2.h b/lib/vquic/curl_ngtcp2.h index 1e9868e0f7..1a87faf00d 100644 --- a/lib/vquic/curl_ngtcp2.h +++ b/lib/vquic/curl_ngtcp2.h @@ -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); diff --git a/lib/vquic/curl_quiche.c b/lib/vquic/curl_quiche.c index fc31c06a46..8ee3e9c087 100644 --- a/lib/vquic/curl_quiche.c +++ b/lib/vquic/curl_quiche.c @@ -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 #include #include -#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 diff --git a/lib/vquic/curl_quiche.h b/lib/vquic/curl_quiche.h index 6c0fb9ee1e..fb5a563ae8 100644 --- a/lib/vquic/curl_quiche.h +++ b/lib/vquic/curl_quiche.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #if !defined(CURL_DISABLE_HTTP) && defined(USE_QUICHE) diff --git a/lib/vquic/vquic-tls.c b/lib/vquic/vquic-tls.c index 3391d98074..e135ac5174 100644 --- a/lib/vquic/vquic-tls.c +++ b/lib/vquic/vquic-tls.c @@ -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 -#include "../vtls/openssl.h" +#include "vtls/openssl.h" #elif defined(USE_GNUTLS) #include #include #include #include #include -#include "../vtls/gtls.h" +#include "vtls/gtls.h" #elif defined(USE_WOLFSSL) #include #include #include -#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, diff --git a/lib/vquic/vquic-tls.h b/lib/vquic/vquic-tls.h index cff7654323..a947cd277b 100644 --- a/lib/vquic/vquic-tls.h +++ b/lib/vquic/vquic-tls.h @@ -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; diff --git a/lib/vquic/vquic.c b/lib/vquic/vquic.c index 7fef051f4c..10cf6cd3cd 100644 --- a/lib/vquic/vquic.c +++ b/lib/vquic/vquic.c @@ -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 #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) diff --git a/lib/vquic/vquic.h b/lib/vquic/vquic.h index f5392eb047..528e18476d 100644 --- a/lib/vquic/vquic.h +++ b/lib/vquic/vquic.h @@ -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; diff --git a/lib/vquic/vquic_int.h b/lib/vquic/vquic_int.h index 4da3c2f192..d77b34d519 100644 --- a/lib/vquic/vquic_int.h +++ b/lib/vquic/vquic_int.h @@ -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 diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c index 6256838704..ad08f34a8f 100644 --- a/lib/vssh/libssh.c +++ b/lib/vssh/libssh.c @@ -24,7 +24,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifdef USE_LIBSSH @@ -42,21 +42,21 @@ #include #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 diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c index f1f241c1fc..61086d6f68 100644 --- a/lib/vssh/libssh2.c +++ b/lib/vssh/libssh2.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifdef USE_LIBSSH2 @@ -41,23 +41,23 @@ #include #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) { diff --git a/lib/vssh/ssh.h b/lib/vssh/ssh.h index 45740ecdad..1afb1e8643 100644 --- a/lib/vssh/ssh.h +++ b/lib/vssh/ssh.h @@ -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; diff --git a/lib/vssh/vssh.c b/lib/vssh/vssh.c index d3abe57b35..d499a633af 100644 --- a/lib/vssh/vssh.c +++ b/lib/vssh/vssh.c @@ -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) diff --git a/lib/vssh/vssh.h b/lib/vssh/vssh.h index 4e1e1d8c6f..492108fbd7 100644 --- a/lib/vssh/vssh.h +++ b/lib/vssh/vssh.h @@ -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, diff --git a/lib/vtls/apple.c b/lib/vtls/apple.c index 2717d24f60..a6a5ba01f0 100644 --- a/lib/vtls/apple.c +++ b/lib/vtls/apple.c @@ -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 diff --git a/lib/vtls/apple.h b/lib/vtls/apple.h index dd1b5db357..d86a56b1f9 100644 --- a/lib/vtls/apple.h +++ b/lib/vtls/apple.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifdef USE_APPLE_SECTRUST struct Curl_cfilter; diff --git a/lib/vtls/cipher_suite.c b/lib/vtls/cipher_suite.c index af51582784..1fc6e9f8c6 100644 --- a/lib/vtls/cipher_suite.c +++ b/lib/vtls/cipher_suite.c @@ -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 diff --git a/lib/vtls/cipher_suite.h b/lib/vtls/cipher_suite.h index f625ce38cb..0e185e351e 100644 --- a/lib/vtls/cipher_suite.h +++ b/lib/vtls/cipher_suite.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #if defined(USE_MBEDTLS) || defined(USE_RUSTLS) diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c index 9887d98c25..a0a465c360 100644 --- a/lib/vtls/gtls.c +++ b/lib/vtls/gtls.c @@ -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 #include -#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 diff --git a/lib/vtls/gtls.h b/lib/vtls/gtls.h index ecdca0a666..a5e55cd4f9 100644 --- a/lib/vtls/gtls.h +++ b/lib/vtls/gtls.h @@ -23,12 +23,13 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifdef USE_GNUTLS #include -#include "../curlx/timeval.h" + +#include "curlx/timeval.h" #ifdef HAVE_GNUTLS_SRP /* the function exists */ diff --git a/lib/vtls/hostcheck.c b/lib/vtls/hostcheck.c index 9706336735..ad09b83194 100644 --- a/lib/vtls/hostcheck.c +++ b/lib/vtls/hostcheck.c @@ -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 #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 */ diff --git a/lib/vtls/hostcheck.h b/lib/vtls/hostcheck.h index 0b4384cb7d..d8e1a52377 100644 --- a/lib/vtls/hostcheck.h +++ b/lib/vtls/hostcheck.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #if defined(USE_OPENSSL) || defined(USE_SCHANNEL) diff --git a/lib/vtls/keylog.c b/lib/vtls/keylog.c index ace9cab1ae..51b26d2d3f 100644 --- a/lib/vtls/keylog.c +++ b/lib/vtls/keylog.c @@ -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; diff --git a/lib/vtls/keylog.h b/lib/vtls/keylog.h index ec82abf547..7e741b964d 100644 --- a/lib/vtls/keylog.h +++ b/lib/vtls/keylog.h @@ -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) diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c index 3f5654ea0b..398bf8630a 100644 --- a/lib/vtls/mbedtls.c +++ b/lib/vtls/mbedtls.c @@ -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 #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) diff --git a/lib/vtls/mbedtls.h b/lib/vtls/mbedtls.h index 3876fe36fc..d8a0a06eb6 100644 --- a/lib/vtls/mbedtls.h +++ b/lib/vtls/mbedtls.h @@ -24,7 +24,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifdef USE_MBEDTLS diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 4142e937a2..8572f0ec13 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -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 #include diff --git a/lib/vtls/openssl.h b/lib/vtls/openssl.h index b99ac8a3a5..cfffe9df1b 100644 --- a/lib/vtls/openssl.h +++ b/lib/vtls/openssl.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifdef USE_OPENSSL /* @@ -34,7 +34,7 @@ #include #include -#include "../urldata.h" +#include "urldata.h" #if OPENSSL_VERSION_NUMBER >= 0x30000000L #define HAVE_OPENSSL3 /* non-fork OpenSSL 3.x or later */ diff --git a/lib/vtls/rustls.c b/lib/vtls/rustls.c index 02a6b7d5aa..63ee0349a1 100644 --- a/lib/vtls/rustls.c +++ b/lib/vtls/rustls.c @@ -23,23 +23,23 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifdef USE_RUSTLS #include -#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; diff --git a/lib/vtls/rustls.h b/lib/vtls/rustls.h index 2d3b0bb11f..b6ddbd1b7e 100644 --- a/lib/vtls/rustls.h +++ b/lib/vtls/rustls.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifdef USE_RUSTLS diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index 032d2eab56..d533d9a5b6 100644 --- a/lib/vtls/schannel.c +++ b/lib/vtls/schannel.c @@ -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 diff --git a/lib/vtls/schannel.h b/lib/vtls/schannel.h index 3cf9487a75..fe49e9a9d0 100644 --- a/lib/vtls/schannel.h +++ b/lib/vtls/schannel.h @@ -24,15 +24,15 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifdef USE_SCHANNEL #include -#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; diff --git a/lib/vtls/schannel_int.h b/lib/vtls/schannel_int.h index 6359d43915..496635f2c2 100644 --- a/lib/vtls/schannel_int.h +++ b/lib/vtls/schannel_int.h @@ -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: diff --git a/lib/vtls/schannel_verify.c b/lib/vtls/schannel_verify.c index 6550899b03..8533e9ccc1 100644 --- a/lib/vtls/schannel_verify.c +++ b/lib/vtls/schannel_verify.c @@ -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 "vtls/schannel.h" +#include "vtls/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 "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) diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c index fcaa173daa..df9bc33a7b 100644 --- a/lib/vtls/vtls.c +++ b/lib/vtls/vtls.c @@ -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 #endif -#include "../urldata.h" -#include "../cfilters.h" +#include "urldata.h" +#include "cfilters.h" -#include "vtls.h" /* generic SSL protos etc */ -#include "vtls_int.h" -#include "vtls_scache.h" +#include "vtls/vtls.h" /* generic SSL protos etc */ +#include "vtls/vtls_int.h" +#include "vtls/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 "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" +#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 diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h index 12ae3a4c73..3dff1f04fd 100644 --- a/lib/vtls/vtls.h +++ b/lib/vtls/vtls.h @@ -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 */ diff --git a/lib/vtls/vtls_int.h b/lib/vtls/vtls_int.h index 48674eded6..6700ee74cb 100644 --- a/lib/vtls/vtls_int.h +++ b/lib/vtls/vtls_int.h @@ -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; diff --git a/lib/vtls/vtls_scache.c b/lib/vtls/vtls_scache.c index b5a2b5d844..1bc0b4fba9 100644 --- a/lib/vtls/vtls_scache.c +++ b/lib/vtls/vtls_scache.c @@ -21,7 +21,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #ifdef USE_SSL @@ -29,21 +29,21 @@ #include #endif -#include "../urldata.h" -#include "../cfilters.h" +#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 "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" +#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 */ diff --git a/lib/vtls/vtls_scache.h b/lib/vtls/vtls_scache.h index 410fe656e0..b9db0f19b3 100644 --- a/lib/vtls/vtls_scache.h +++ b/lib/vtls/vtls_scache.h @@ -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; diff --git a/lib/vtls/vtls_spack.c b/lib/vtls/vtls_spack.c index 2026fe3ed5..d96f4e41bd 100644 --- a/lib/vtls/vtls_spack.c +++ b/lib/vtls/vtls_spack.c @@ -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 diff --git a/lib/vtls/vtls_spack.h b/lib/vtls/vtls_spack.h index 86796ee62e..4479384de9 100644 --- a/lib/vtls/vtls_spack.h +++ b/lib/vtls/vtls_spack.h @@ -23,7 +23,7 @@ * SPDX-License-Identifier: curl * ***************************************************************************/ -#include "../curl_setup.h" +#include "curl_setup.h" #if defined(USE_SSL) && defined(USE_SSLS_EXPORT) diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c index 41965062f0..377175d56d 100644 --- a/lib/vtls/wolfssl.c +++ b/lib/vtls/wolfssl.c @@ -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 #include -#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 diff --git a/lib/vtls/wolfssl.h b/lib/vtls/wolfssl.h index 736da9a1a6..b097b60b78 100644 --- a/lib/vtls/wolfssl.h +++ b/lib/vtls/wolfssl.h @@ -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; diff --git a/lib/vtls/x509asn1.c b/lib/vtls/x509asn1.c index 27fe149dcb..ff64dc9bf4 100644 --- a/lib/vtls/x509asn1.c +++ b/lib/vtls/x509asn1.c @@ -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. diff --git a/lib/vtls/x509asn1.h b/lib/vtls/x509asn1.h index ba2c3893a9..829dfd884f 100644 --- a/lib/vtls/x509asn1.h +++ b/lib/vtls/x509asn1.h @@ -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. diff --git a/projects/Windows/tmpl/curl.vcxproj b/projects/Windows/tmpl/curl.vcxproj index c963f6388e..c480fe8b33 100644 --- a/projects/Windows/tmpl/curl.vcxproj +++ b/projects/Windows/tmpl/curl.vcxproj @@ -839,7 +839,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -869,7 +869,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -898,7 +898,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -928,7 +928,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -956,7 +956,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -988,7 +988,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -1019,7 +1019,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions) true EnableFastChecks @@ -1051,7 +1051,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions) true EnableFastChecks @@ -1082,7 +1082,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions) true EnableFastChecks @@ -1114,7 +1114,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions) true EnableFastChecks @@ -1145,7 +1145,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions) true EnableFastChecks @@ -1176,7 +1176,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions) true EnableFastChecks @@ -1208,7 +1208,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions) true EnableFastChecks @@ -1240,7 +1240,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions) true EnableFastChecks @@ -1272,7 +1272,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -1302,7 +1302,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -1331,7 +1331,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -1360,7 +1360,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -1390,7 +1390,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -1420,7 +1420,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -1448,7 +1448,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions) true EnableFastChecks @@ -1480,7 +1480,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;%(PreprocessorDefinitions) true EnableFastChecks @@ -1512,7 +1512,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -1542,7 +1542,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -1570,7 +1570,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -1602,7 +1602,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -1634,7 +1634,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -1664,7 +1664,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -1692,7 +1692,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -1724,7 +1724,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -1756,7 +1756,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -1786,7 +1786,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -1814,7 +1814,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -1846,7 +1846,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -1878,7 +1878,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -1908,7 +1908,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -1936,7 +1936,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -1968,7 +1968,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -2000,7 +2000,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -2030,7 +2030,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -2058,7 +2058,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -2089,7 +2089,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -2121,7 +2121,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -2153,7 +2153,7 @@ Disabled - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEBUGBUILD;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -2185,7 +2185,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -2214,7 +2214,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -2244,7 +2244,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -2274,7 +2274,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\lib\curlx;%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\lib;..\..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;CURL_STATICLIB;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/src/toolx/tool_time.c b/src/toolx/tool_time.c index affcd7a167..12eaea9fe4 100644 --- a/src/toolx/tool_time.c +++ b/src/toolx/tool_time.c @@ -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 /* for _localtime32_s(), _localtime64_s() */