curl tool: make curl.h first header included in tool_setup.h

2025-02-17 14:59:45 +08:00 · 2012-04-08 13:50:18 +02:00 · 2012-04-08 13:50:18 +02:00 · 01b0f1061d
commit 01b0f1061d
parent 3d8c093145
28 changed files with 2 additions and 53 deletions
--- a/src/tool_cb_dbg.c
+++ b/src/tool_cb_dbg.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
 #include "curlx.h"
--- a/src/tool_cb_hdr.c
+++ b/src/tool_cb_hdr.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #include "rawstr.h"

 #define ENABLE_CURLX_PRINTF
--- a/src/tool_cb_prg.c
+++ b/src/tool_cb_prg.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
 #include "curlx.h"
--- a/src/tool_cb_rea.c
+++ b/src/tool_cb_rea.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
--- a/src/tool_cb_see.c
+++ b/src/tool_cb_see.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
--- a/src/tool_cb_wrt.c
+++ b/src/tool_cb_wrt.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
 #include "curlx.h"
--- a/src/tool_cfgable.c
+++ b/src/tool_cfgable.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #include "tool_cfgable.h"

 #include "memdebug.h" /* keep this as LAST include */
--- a/src/tool_convert.c
+++ b/src/tool_convert.c
@ -27,8 +27,6 @@
 #  include <iconv.h>
 #endif

-#include <curl/curl.h>
-
 #include "tool_convert.h"

 #include "memdebug.h" /* keep this as LAST include */
--- a/src/tool_dirhie.c
+++ b/src/tool_dirhie.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #include <sys/stat.h>

 #ifdef HAVE_UNISTD_H
--- a/src/tool_doswin.c
+++ b/src/tool_doswin.c
@ -28,7 +28,6 @@
 #endif

 #ifdef WIN32
-#  include <curl/curl.h>
 #  include "tool_cfgable.h"
 #  include "tool_libinfo.h"
 #endif
--- a/src/tool_easysrc.c
+++ b/src/tool_easysrc.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #ifndef CURL_DISABLE_LIBCURL_OPTION

 #define ENABLE_CURLX_PRINTF
--- a/src/tool_formparse.c
+++ b/src/tool_formparse.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #include "rawstr.h"

 #define ENABLE_CURLX_PRINTF
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #include "rawstr.h"

 #define ENABLE_CURLX_PRINTF
--- a/src/tool_helpers.c
+++ b/src/tool_helpers.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #include "rawstr.h"

 #define ENABLE_CURLX_PRINTF
--- a/src/tool_libinfo.c
+++ b/src/tool_libinfo.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #include "rawstr.h"

 #define ENABLE_CURLX_PRINTF
--- a/src/tool_main.c
+++ b/src/tool_main.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #include <sys/stat.h>

 #ifdef HAVE_UNISTD_H
--- a/src/tool_mfiles.c
+++ b/src/tool_mfiles.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #include "tool_mfiles.h"

 #include "memdebug.h" /* keep this as LAST include */
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
--- a/src/tool_operhlp.c
+++ b/src/tool_operhlp.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #include "rawstr.h"

 #define ENABLE_CURLX_PRINTF
--- a/src/tool_paramhlp.c
+++ b/src/tool_paramhlp.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #include "rawstr.h"

 #define ENABLE_CURLX_PRINTF
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
 #include "curlx.h"
--- a/src/tool_setopt.c
+++ b/src/tool_setopt.c
@ -23,8 +23,6 @@

 #ifndef CURL_DISABLE_LIBCURL_OPTION

-#include <curl/curl.h>
-
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
 #include "curlx.h"
--- a/src/tool_setup.h
+++ b/src/tool_setup.h
@ -24,6 +24,8 @@

 #define CURL_NO_OLDIES

+#include <curl/curl.h> /* external interface */
+
 #include "setup.h" /* from the lib directory */

 #if defined(macintosh) && defined(__MRC__)
--- a/src/tool_urlglob.c
+++ b/src/tool_urlglob.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #define _MPRINTF_REPLACE /* we want curl-functions instead of native ones */
 #include <curl/mprintf.h>

--- a/src/tool_vms.c
+++ b/src/tool_vms.c
@ -28,8 +28,6 @@
 #include <unixlib.h>
 #endif

-#include <curl/curl.h>
-
 #define ENABLE_CURLX_PRINTF
 #include "curlx.h"

--- a/src/tool_writeenv.c
+++ b/src/tool_writeenv.c
@ -27,8 +27,6 @@
 #  include <kernel.h>
 #endif

-#include <curl/curl.h>
-
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>

--- a/src/tool_writeout.c
+++ b/src/tool_writeout.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "tool_setup.h"

-#include <curl/curl.h>
-
 #define _MPRINTF_REPLACE /* we want curl-functions instead of native ones */
 #include <curl/mprintf.h>

--- a/src/tool_xattr.c
+++ b/src/tool_xattr.c
@ -25,8 +25,6 @@
 #  include <sys/xattr.h> /* header from libc, not from libattr */
 #endif

-#include <curl/curl.h>
-
 #include "tool_xattr.h"

 #include "memdebug.h" /* keep this as LAST include */