lib: include files using known path

by including headers using "../[header]" when done from C files in
subdirectories, we do not need to specify the lib source dir as an
include path and we reduce the risk of header name collisions with
headers in the SDK using the same file names.

Idea-by: Kai Pastor

Ref: #16949
Closes #16991
This commit is contained in:
Daniel Stenberg 2025-04-08 08:00:12 +02:00
parent 7e4d516bcb
commit 625f2c1644
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
71 changed files with 580 additions and 587 deletions

View file

@ -25,23 +25,23 @@
*
***************************************************************************/
#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 <curl/curl.h>
#include "urldata.h"
#include "../urldata.h"
#include "vauth/vauth.h"
#include "warnless.h"
#include "sendf.h"
#include "curl_printf.h"
#include "vauth.h"
#include "../warnless.h"
#include "../sendf.h"
#include "../curl_printf.h"
/* The last #include files should be: */
#include "curl_memory.h"
#include "memdebug.h"
#include "../curl_memory.h"
#include "../memdebug.h"
/*
* Curl_auth_create_plain_message()

View file

@ -24,22 +24,22 @@
*
***************************************************************************/
#include "curl_setup.h"
#include "../curl_setup.h"
#ifndef CURL_DISABLE_DIGEST_AUTH
#include <curl/curl.h>
#include "urldata.h"
#include "../urldata.h"
#include "vauth/vauth.h"
#include "curl_hmac.h"
#include "curl_md5.h"
#include "warnless.h"
#include "curl_printf.h"
#include "vauth.h"
#include "../curl_hmac.h"
#include "../curl_md5.h"
#include "../warnless.h"
#include "../curl_printf.h"
/* The last #include files should be: */
#include "curl_memory.h"
#include "memdebug.h"
#include "../curl_memory.h"
#include "../memdebug.h"
/*

View file

@ -25,30 +25,30 @@
*
***************************************************************************/
#include "curl_setup.h"
#include "../curl_setup.h"
#ifndef CURL_DISABLE_DIGEST_AUTH
#include <curl/curl.h>
#include "vauth/vauth.h"
#include "vauth/digest.h"
#include "urldata.h"
#include "curl_base64.h"
#include "curl_hmac.h"
#include "curl_md5.h"
#include "curl_sha256.h"
#include "curl_sha512_256.h"
#include "vtls/vtls.h"
#include "warnless.h"
#include "strparse.h"
#include "strcase.h"
#include "curl_printf.h"
#include "rand.h"
#include "vauth.h"
#include "digest.h"
#include "../urldata.h"
#include "../curl_base64.h"
#include "../curl_hmac.h"
#include "../curl_md5.h"
#include "../curl_sha256.h"
#include "../curl_sha512_256.h"
#include "../vtls/vtls.h"
#include "../warnless.h"
#include "../strparse.h"
#include "../strcase.h"
#include "../curl_printf.h"
#include "../rand.h"
/* The last #include files should be: */
#include "curl_memory.h"
#include "memdebug.h"
#include "../curl_memory.h"
#include "../memdebug.h"
#ifndef USE_WINDOWS_SSPI
#define SESSION_ALGO 1 /* for algos with this bit set */

View file

@ -25,25 +25,25 @@
*
***************************************************************************/
#include "curl_setup.h"
#include "../curl_setup.h"
#if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_DIGEST_AUTH)
#include <curl/curl.h>
#include "vauth/vauth.h"
#include "vauth/digest.h"
#include "urldata.h"
#include "warnless.h"
#include "curl_multibyte.h"
#include "sendf.h"
#include "strdup.h"
#include "strcase.h"
#include "strerror.h"
#include "vauth.h"
#include "digest.h"
#include "../urldata.h"
#include "../warnless.h"
#include "../curl_multibyte.h"
#include "../sendf.h"
#include "../strdup.h"
#include "../strcase.h"
#include "../strerror.h"
/* The last #include files should be: */
#include "curl_memory.h"
#include "memdebug.h"
#include "../curl_memory.h"
#include "../memdebug.h"
/*
* Curl_auth_is_digest_supported()

View file

@ -24,22 +24,22 @@
*
***************************************************************************/
#include "curl_setup.h"
#include "../curl_setup.h"
#ifdef USE_GSASL
#include <curl/curl.h>
#include "vauth/vauth.h"
#include "urldata.h"
#include "sendf.h"
#include "vauth.h"
#include "../urldata.h"
#include "../sendf.h"
#include <gsasl.h>
/* The last 3 #include files should be in this order */
#include "curl_printf.h"
#include "curl_memory.h"
#include "memdebug.h"
#include "../curl_printf.h"
#include "../curl_memory.h"
#include "../memdebug.h"
bool Curl_auth_gsasl_is_supported(struct Curl_easy *data,
const char *mech,

View file

@ -25,22 +25,22 @@
*
***************************************************************************/
#include "curl_setup.h"
#include "../curl_setup.h"
#if defined(HAVE_GSSAPI) && defined(USE_KERBEROS5)
#include <curl/curl.h>
#include "vauth/vauth.h"
#include "curl_sasl.h"
#include "urldata.h"
#include "curl_gssapi.h"
#include "sendf.h"
#include "curl_printf.h"
#include "vauth.h"
#include "../curl_sasl.h"
#include "../urldata.h"
#include "../curl_gssapi.h"
#include "../sendf.h"
#include "../curl_printf.h"
/* The last #include files should be: */
#include "curl_memory.h"
#include "memdebug.h"
#include "../curl_memory.h"
#include "../memdebug.h"
#if defined(__GNUC__) && defined(__APPLE__)
#pragma GCC diagnostic push

View file

@ -24,21 +24,21 @@
*
***************************************************************************/
#include "curl_setup.h"
#include "../curl_setup.h"
#if defined(USE_WINDOWS_SSPI) && defined(USE_KERBEROS5)
#include <curl/curl.h>
#include "vauth/vauth.h"
#include "urldata.h"
#include "warnless.h"
#include "curl_multibyte.h"
#include "sendf.h"
#include "vauth.h"
#include "../urldata.h"
#include "../warnless.h"
#include "../curl_multibyte.h"
#include "../sendf.h"
/* The last #include files should be: */
#include "curl_memory.h"
#include "memdebug.h"
#include "../curl_memory.h"
#include "../memdebug.h"
/*
* Curl_auth_is_gssapi_supported()

View file

@ -22,7 +22,7 @@
*
***************************************************************************/
#include "curl_setup.h"
#include "../curl_setup.h"
#if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)
@ -35,24 +35,24 @@
#define DEBUG_ME 0
#include "urldata.h"
#include "sendf.h"
#include "curl_ntlm_core.h"
#include "curl_gethostname.h"
#include "curl_multibyte.h"
#include "curl_md5.h"
#include "warnless.h"
#include "rand.h"
#include "vtls/vtls.h"
#include "strdup.h"
#include "../urldata.h"
#include "../sendf.h"
#include "../curl_ntlm_core.h"
#include "../curl_gethostname.h"
#include "../curl_multibyte.h"
#include "../curl_md5.h"
#include "../warnless.h"
#include "../rand.h"
#include "../vtls/vtls.h"
#include "../strdup.h"
#include "vauth/vauth.h"
#include "curl_endian.h"
#include "curl_printf.h"
#include "vauth.h"
#include "../curl_endian.h"
#include "../curl_printf.h"
/* The last #include files should be: */
#include "curl_memory.h"
#include "memdebug.h"
#include "../curl_memory.h"
#include "../memdebug.h"
/* NTLM buffer fixed size, large enough for long user + host + domain */

View file

@ -22,23 +22,23 @@
*
***************************************************************************/
#include "curl_setup.h"
#include "../curl_setup.h"
#if defined(USE_WINDOWS_SSPI) && defined(USE_NTLM)
#include <curl/curl.h>
#include "vauth/vauth.h"
#include "urldata.h"
#include "curl_ntlm_core.h"
#include "warnless.h"
#include "curl_multibyte.h"
#include "sendf.h"
#include "strdup.h"
#include "vauth.h"
#include "../urldata.h"
#include "../curl_ntlm_core.h"
#include "../warnless.h"
#include "../curl_multibyte.h"
#include "../sendf.h"
#include "../strdup.h"
/* The last #include files should be: */
#include "curl_memory.h"
#include "memdebug.h"
#include "../curl_memory.h"
#include "../memdebug.h"
/*
* Curl_auth_is_ntlm_supported()

View file

@ -24,22 +24,22 @@
*
***************************************************************************/
#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 <curl/curl.h>
#include "urldata.h"
#include "../urldata.h"
#include "vauth/vauth.h"
#include "warnless.h"
#include "curl_printf.h"
#include "vauth.h"
#include "../warnless.h"
#include "../curl_printf.h"
/* The last #include files should be: */
#include "curl_memory.h"
#include "memdebug.h"
#include "../curl_memory.h"
#include "../memdebug.h"
/*
* Curl_auth_create_oauth_bearer_message()

View file

@ -24,23 +24,23 @@
*
***************************************************************************/
#include "curl_setup.h"
#include "../curl_setup.h"
#if defined(HAVE_GSSAPI) && defined(USE_SPNEGO)
#include <curl/curl.h>
#include "vauth/vauth.h"
#include "urldata.h"
#include "curl_base64.h"
#include "curl_gssapi.h"
#include "warnless.h"
#include "curl_multibyte.h"
#include "sendf.h"
#include "vauth.h"
#include "../urldata.h"
#include "../curl_base64.h"
#include "../curl_gssapi.h"
#include "../warnless.h"
#include "../curl_multibyte.h"
#include "../sendf.h"
/* The last #include files should be: */
#include "curl_memory.h"
#include "memdebug.h"
#include "../curl_memory.h"
#include "../memdebug.h"
#if defined(__GNUC__) && defined(__APPLE__)
#pragma GCC diagnostic push

View file

@ -24,23 +24,23 @@
*
***************************************************************************/
#include "curl_setup.h"
#include "../curl_setup.h"
#if defined(USE_WINDOWS_SSPI) && defined(USE_SPNEGO)
#include <curl/curl.h>
#include "vauth/vauth.h"
#include "urldata.h"
#include "curl_base64.h"
#include "warnless.h"
#include "curl_multibyte.h"
#include "sendf.h"
#include "strerror.h"
#include "vauth.h"
#include "../urldata.h"
#include "../curl_base64.h"
#include "../warnless.h"
#include "../curl_multibyte.h"
#include "../sendf.h"
#include "../strerror.h"
/* The last #include files should be: */
#include "curl_memory.h"
#include "memdebug.h"
#include "../curl_memory.h"
#include "../memdebug.h"
/*
* Curl_auth_is_spnego_supported()

View file

@ -22,19 +22,19 @@
*
***************************************************************************/
#include "curl_setup.h"
#include "../curl_setup.h"
#include <curl/curl.h>
#include "vauth.h"
#include "urldata.h"
#include "strcase.h"
#include "curl_multibyte.h"
#include "curl_printf.h"
#include "../urldata.h"
#include "../strcase.h"
#include "../curl_multibyte.h"
#include "../curl_printf.h"
/* The last #include files should be: */
#include "curl_memory.h"
#include "memdebug.h"
#include "../curl_memory.h"
#include "../memdebug.h"
/*
* Curl_auth_build_spn()

View file

@ -26,7 +26,7 @@
#include <curl/curl.h>
#include "bufref.h"
#include "../bufref.h"
struct Curl_easy;