build: include curlx headers directly in src and tests

To include what's actually used.

Also:
- drop unused includes.
- scope includes where possible.
- drop `curlx/curlx.h` umbrella header.
- config2setopts: include `netinet/in.h` for Cygwin/MSYS2.
  Previously included by chance via an unused curlx include.

Closes #20776
This commit is contained in:
Viktor Szakats 2026-03-01 00:54:09 +01:00
parent ca92e20123
commit 030d6aeaf3
No known key found for this signature in database
8 changed files with 41 additions and 56 deletions

View file

@ -43,7 +43,15 @@ extern const struct entry_s s_entries[];
extern int unitfail; /* for unittests */
#include <curlx/curlx.h>
#include "curlx/base64.h" /* for curlx_base64* */
#include "curlx/dynbuf.h" /* for curlx_dyn_*() */
#include "curlx/fopen.h" /* for curlx_f*() */
#include "curlx/strcopy.h" /* for curlx_strcopy() */
#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/wait.h" /* for curlx_wait_ms() */
#ifdef HAVE_SYS_SELECT_H
/* since so many tests use select(), we can just as well include it here */

View file

@ -62,7 +62,18 @@ extern const struct entry_s s_entries[];
#include <netdb.h>
#endif
#include <curlx/curlx.h>
#include "curlx/base64.h" /* for curlx_base64* */
#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/nonblock.h" /* for curlx_nonblock() */
#include "curlx/strcopy.h" /* for curlx_strcopy() */
#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/wait.h" /* for curlx_wait_ms() */
#include "curlx/winapi.h" /* for curlx_winapi_strerror() */
#ifdef _WIN32
#include <curlx/snprintf.h>