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

@ -1,52 +0,0 @@
#ifndef HEADER_CURL_CURLX_H
#define HEADER_CURL_CURLX_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at https://curl.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
* SPDX-License-Identifier: curl
*
***************************************************************************/
/*
* Defines protos and includes all header files that provide the curlx_*
* functions. The curlx_* functions are not part of the libcurl API, but are
* stand-alone functions whose sources can be built and linked by apps if need
* be.
*/
#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 */