From 01b0f1061da2bd7a8703f4c8aa846a9088d7ab3e Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sun, 8 Apr 2012 13:50:18 +0200 Subject: [PATCH] curl tool: make curl.h first header included in tool_setup.h --- src/tool_cb_dbg.c | 2 -- src/tool_cb_hdr.c | 2 -- src/tool_cb_prg.c | 2 -- src/tool_cb_rea.c | 2 -- src/tool_cb_see.c | 2 -- src/tool_cb_wrt.c | 2 -- src/tool_cfgable.c | 2 -- src/tool_convert.c | 2 -- src/tool_dirhie.c | 2 -- src/tool_doswin.c | 1 - src/tool_easysrc.c | 2 -- src/tool_formparse.c | 2 -- src/tool_getparam.c | 2 -- src/tool_helpers.c | 2 -- src/tool_libinfo.c | 2 -- src/tool_main.c | 2 -- src/tool_mfiles.c | 2 -- src/tool_operate.c | 2 -- src/tool_operhlp.c | 2 -- src/tool_paramhlp.c | 2 -- src/tool_parsecfg.c | 2 -- src/tool_setopt.c | 2 -- src/tool_setup.h | 2 ++ src/tool_urlglob.c | 2 -- src/tool_vms.c | 2 -- src/tool_writeenv.c | 2 -- src/tool_writeout.c | 2 -- src/tool_xattr.c | 2 -- 28 files changed, 2 insertions(+), 53 deletions(-) diff --git a/src/tool_cb_dbg.c b/src/tool_cb_dbg.c index e3bee1bdb1..1850ba0c66 100644 --- a/src/tool_cb_dbg.c +++ b/src/tool_cb_dbg.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ #include "curlx.h" diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c index d222bbe24e..e963311773 100644 --- a/src/tool_cb_hdr.c +++ b/src/tool_cb_hdr.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #include "rawstr.h" #define ENABLE_CURLX_PRINTF diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c index 5c8a4ad57e..809b4d4870 100644 --- a/src/tool_cb_prg.c +++ b/src/tool_cb_prg.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ #include "curlx.h" diff --git a/src/tool_cb_rea.c b/src/tool_cb_rea.c index ab03096a72..5320cdb304 100644 --- a/src/tool_cb_rea.c +++ b/src/tool_cb_rea.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #ifdef HAVE_UNISTD_H # include #endif diff --git a/src/tool_cb_see.c b/src/tool_cb_see.c index b44677eefd..00afcb4006 100644 --- a/src/tool_cb_see.c +++ b/src/tool_cb_see.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #ifdef HAVE_UNISTD_H # include #endif diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c index df055471b0..fa47dd3f33 100644 --- a/src/tool_cb_wrt.c +++ b/src/tool_cb_wrt.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ #include "curlx.h" diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c index a17db0bb05..da11f4afe4 100644 --- a/src/tool_cfgable.c +++ b/src/tool_cfgable.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #include "tool_cfgable.h" #include "memdebug.h" /* keep this as LAST include */ diff --git a/src/tool_convert.c b/src/tool_convert.c index 93552ace4f..ecce036a09 100644 --- a/src/tool_convert.c +++ b/src/tool_convert.c @@ -27,8 +27,6 @@ # include #endif -#include - #include "tool_convert.h" #include "memdebug.h" /* keep this as LAST include */ diff --git a/src/tool_dirhie.c b/src/tool_dirhie.c index dae0937fb6..d21dc97c6f 100644 --- a/src/tool_dirhie.c +++ b/src/tool_dirhie.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #include #ifdef HAVE_UNISTD_H diff --git a/src/tool_doswin.c b/src/tool_doswin.c index 02957dbb9a..c1ba48ea91 100644 --- a/src/tool_doswin.c +++ b/src/tool_doswin.c @@ -28,7 +28,6 @@ #endif #ifdef WIN32 -# include # include "tool_cfgable.h" # include "tool_libinfo.h" #endif diff --git a/src/tool_easysrc.c b/src/tool_easysrc.c index 24073d14e9..555ab0a186 100644 --- a/src/tool_easysrc.c +++ b/src/tool_easysrc.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #ifndef CURL_DISABLE_LIBCURL_OPTION #define ENABLE_CURLX_PRINTF diff --git a/src/tool_formparse.c b/src/tool_formparse.c index 14003e7ccd..e83f7eda12 100644 --- a/src/tool_formparse.c +++ b/src/tool_formparse.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #include "rawstr.h" #define ENABLE_CURLX_PRINTF diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 642f5d286a..5a24cc8a93 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #include "rawstr.h" #define ENABLE_CURLX_PRINTF diff --git a/src/tool_helpers.c b/src/tool_helpers.c index 3faed6f4a9..87d7c609d3 100644 --- a/src/tool_helpers.c +++ b/src/tool_helpers.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #include "rawstr.h" #define ENABLE_CURLX_PRINTF diff --git a/src/tool_libinfo.c b/src/tool_libinfo.c index ba2f443259..81b6680c81 100644 --- a/src/tool_libinfo.c +++ b/src/tool_libinfo.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #include "rawstr.h" #define ENABLE_CURLX_PRINTF diff --git a/src/tool_main.c b/src/tool_main.c index 23d7df5e8e..be1b3fcaa6 100644 --- a/src/tool_main.c +++ b/src/tool_main.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #include #ifdef HAVE_UNISTD_H diff --git a/src/tool_mfiles.c b/src/tool_mfiles.c index b609b6e80d..3eda45f91a 100644 --- a/src/tool_mfiles.c +++ b/src/tool_mfiles.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #include "tool_mfiles.h" #include "memdebug.h" /* keep this as LAST include */ diff --git a/src/tool_operate.c b/src/tool_operate.c index 38df6d2cab..ed581e89e1 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #ifdef HAVE_UNISTD_H # include #endif diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c index 8b31f54aad..7a98e350ba 100644 --- a/src/tool_operhlp.c +++ b/src/tool_operhlp.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #include "rawstr.h" #define ENABLE_CURLX_PRINTF diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c index b09b33cd0f..4d1d17a520 100644 --- a/src/tool_paramhlp.c +++ b/src/tool_paramhlp.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #include "rawstr.h" #define ENABLE_CURLX_PRINTF diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c index 8bcc00744d..561dada115 100644 --- a/src/tool_parsecfg.c +++ b/src/tool_parsecfg.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ #include "curlx.h" diff --git a/src/tool_setopt.c b/src/tool_setopt.c index d387af181e..0b6207be43 100644 --- a/src/tool_setopt.c +++ b/src/tool_setopt.c @@ -23,8 +23,6 @@ #ifndef CURL_DISABLE_LIBCURL_OPTION -#include - #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ #include "curlx.h" diff --git a/src/tool_setup.h b/src/tool_setup.h index c5c552c866..648b0f2267 100644 --- a/src/tool_setup.h +++ b/src/tool_setup.h @@ -24,6 +24,8 @@ #define CURL_NO_OLDIES +#include /* external interface */ + #include "setup.h" /* from the lib directory */ #if defined(macintosh) && defined(__MRC__) diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c index de815dce4e..5e73f14766 100644 --- a/src/tool_urlglob.c +++ b/src/tool_urlglob.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #define _MPRINTF_REPLACE /* we want curl-functions instead of native ones */ #include diff --git a/src/tool_vms.c b/src/tool_vms.c index 9d9bcc1d49..4a6a6f58e2 100644 --- a/src/tool_vms.c +++ b/src/tool_vms.c @@ -28,8 +28,6 @@ #include #endif -#include - #define ENABLE_CURLX_PRINTF #include "curlx.h" diff --git a/src/tool_writeenv.c b/src/tool_writeenv.c index 166e6d97f8..a9462d0042 100644 --- a/src/tool_writeenv.c +++ b/src/tool_writeenv.c @@ -27,8 +27,6 @@ # include #endif -#include - #define _MPRINTF_REPLACE /* use our functions only */ #include diff --git a/src/tool_writeout.c b/src/tool_writeout.c index 760d4bfb8f..6038a210ab 100644 --- a/src/tool_writeout.c +++ b/src/tool_writeout.c @@ -21,8 +21,6 @@ ***************************************************************************/ #include "tool_setup.h" -#include - #define _MPRINTF_REPLACE /* we want curl-functions instead of native ones */ #include diff --git a/src/tool_xattr.c b/src/tool_xattr.c index 9c7e7049c4..505bdb17a6 100644 --- a/src/tool_xattr.c +++ b/src/tool_xattr.c @@ -25,8 +25,6 @@ # include /* header from libc, not from libattr */ #endif -#include - #include "tool_xattr.h" #include "memdebug.h" /* keep this as LAST include */