← Commit list

030d6aeaf3

Viktor Szakats
Viktor Szakats
2026-03-16
SUCCESS Duration: 258s

Subject

build: include curlx headers directly in src and tests

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

lib/Makefile.inc +0 -1lib/curlx/curlx.h +0 -52src/config2setopts.c +4 -0src/tool_doswin.c +3 -0src/tool_operate.c +2 -0src/tool_setup.h +11 -1tests/libtest/first.h +9 -1tests/server/first.h +12 -1
lib/Makefile.inc+0 -1
@@ -47,7 +47,6 @@ LIB_CURLX_CFILES = \
LIB_CURLX_HFILES = \
curlx/base64.h \
curlx/basename.h \
- curlx/curlx.h \
curlx/dynbuf.h \
curlx/fopen.h \
curlx/inet_ntop.h \
lib/curlx/curlx.h+0 -52
@@ -1,52 +0,0 @@
-#ifndef HEADER_CURL_CURLX_H
-#define HEADER_CURL_CURLX_H
-/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
- * \___|\___/|_| \_\_____|
- *
- * Copyright (C) Daniel Stenberg, <[email protected]>, 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 */
src/config2setopts.c+4 -0
@@ -40,6 +40,10 @@
#include "tool_helpers.h"
#include "tool_version.h"
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h> /* IPPROTO_IPV6 */
+#endif
+
#define BUFFER_SIZE 102400L
#ifdef IP_TOS
src/tool_doswin.c+3 -0
@@ -25,6 +25,9 @@
#if defined(_WIN32) || defined(MSDOS)
+#include "curlx/basename.h" /* for curlx_basename() */
+#include "curlx/version_win32.h" /* for curlx_verify_windows_version() */
+
#ifdef _WIN32
# include <tlhelp32.h>
#elif !defined(__DJGPP__) || (__DJGPP__ < 2) /* DJGPP 2.0 has _use_lfn() */
src/tool_operate.c+2 -0
@@ -23,6 +23,8 @@
***************************************************************************/
#include "tool_setup.h"
+#include "curlx/nonblock.h" /* for curlx_nonblock() */
+
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
src/tool_setup.h+11 -1
@@ -45,7 +45,17 @@ extern FILE *tool_stderr;
* curl tool certainly uses libcurl's external interface.
*/
-#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/multibyte.h" /* for curlx_convert_*() */
+#include "curlx/strcopy.h" /* for curlx_strcopy() */
+#include "curlx/strdup.h" /* for curlx_memdup*() */
+#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() */
/*
* Platform specific stuff.
tests/libtest/first.h+9 -1
@@ -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 */
tests/server/first.h+12 -1
@@ -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>