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

diff --git a/src/tool_cb_dbg.c b/src/tool_cb_dbg.c
index e3bee1bdb1bacaa616c709d3ab71e6ef7c51b436..1850ba0c667ed68439438938b57ce7bfdbdd551f 100644 (file)
--- 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"

diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
index d222bbe24e74118043be9084c2ec85c365b9b510..e963311773bf5365732e6a7e88ac46c0ed4636bc 100644 (file)
--- 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

diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c
index 5c8a4ad57e78ff1d788342eba9e72e8e5762163e..809b4d4870b1335137d91225b1c68a85ec382cd7 100644 (file)
--- 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"

diff --git a/src/tool_cb_rea.c b/src/tool_cb_rea.c
index ab03096a72134505013d99a13b821e1bb3fe7d15..5320cdb304df3079ab731c8da096f4b1cf4be1ff 100644 (file)
--- 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

diff --git a/src/tool_cb_see.c b/src/tool_cb_see.c
index b44677eefdc5a5ce6f12c84ac609899d0b877a7a..00afcb400663af5f5285594184556121992fbb69 100644 (file)
--- 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

diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c
index df055471b0650ff108bf50e5bd23108cbe4bcbf6..fa47dd3f33c172561fb4c3eab43b83a6c647bb76 100644 (file)
--- 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"

diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c
index a17db0bb050b5bc9988f0a9c2165e1e274cb9479..da11f4afe4a6f56dc9089148b8a0b0775c229e7a 100644 (file)
--- 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 */

diff --git a/src/tool_convert.c b/src/tool_convert.c
index 93552ace4fd69ec0a0fe4148103cda3c0d053d1c..ecce036a09a40b19046e45cb69a06cf579b95575 100644 (file)
--- 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 */

diff --git a/src/tool_dirhie.c b/src/tool_dirhie.c
index dae0937fb651e1fb879a23e1c746da21949d09c9..d21dc97c6f2b75d0aa7b6d66dc734c97125023d3 100644 (file)
--- 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

diff --git a/src/tool_doswin.c b/src/tool_doswin.c
index 02957dbb9a3da136711c42fde36e2d2037613a95..c1ba48ea91e581d7aeb92751438400f3d0cbb992 100644 (file)
--- 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

diff --git a/src/tool_easysrc.c b/src/tool_easysrc.c
index 24073d14e9c36ba61df4fe75319880990b16a7d2..555ab0a18617107b428657a21582aaf5f13f7403 100644 (file)
--- 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

diff --git a/src/tool_formparse.c b/src/tool_formparse.c
index 14003e7ccd1dda63898c1996d0ecb2b4ec6e00d0..e83f7eda1284123d260848dc345d9fdf1d22f41a 100644 (file)
--- 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

diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index 642f5d286ae56250cecc01f943be112d3b3cf7e9..5a24cc8a9313d9fe512bc0696195797bfb996344 100644 (file)
--- 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

diff --git a/src/tool_helpers.c b/src/tool_helpers.c
index 3faed6f4a9856bf57ef207970969b47045ae8b5c..87d7c609d34346367fbb2c66d4e5237ff2401c8c 100644 (file)
--- 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

diff --git a/src/tool_libinfo.c b/src/tool_libinfo.c
index ba2f443259c58a32af9c8d4b5be3badb53d7a095..81b6680c81aead6a33942603ed33fbf16fe30708 100644 (file)
--- 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

diff --git a/src/tool_main.c b/src/tool_main.c
index 23d7df5e8e00b02cbfec603090f68bca65598a42..be1b3fcaa6601ea6ee52a30a4a09d98ae197baeb 100644 (file)
--- 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

diff --git a/src/tool_mfiles.c b/src/tool_mfiles.c
index b609b6e80d45602c044a94ad8369b1fefbfa59ce..3eda45f91a3ce7d260e059b2cbdd4d1231663427 100644 (file)
--- 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 */

diff --git a/src/tool_operate.c b/src/tool_operate.c
index 38df6d2cab108165b647d5779353e848999a37bf..ed581e89e11d681e573b3c4147e603fe2218b206 100644 (file)
--- 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

diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c
index 8b31f54aad5162e50be7fbc9ec10ec202abd3c7e..7a98e350ba5444f56cb98a553703cdc1a4d8cb10 100644 (file)
--- 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

diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c
index b09b33cd0f7d4c379c6daab0c43ac17298159736..4d1d17a520cb9dac6f491804343bb5fb4a35e61b 100644 (file)
--- 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

diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index 8bcc00744d5266d9940f5575a3d36bc9cea60085..561dada1157f9f3b076db1725abce084b79f166d 100644 (file)
--- 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"

diff --git a/src/tool_setopt.c b/src/tool_setopt.c
index d387af181ed428078926522614ea9cf40663c4c9..0b6207be4388b45735066cc495154a2fea24a487 100644 (file)
--- 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"

diff --git a/src/tool_setup.h b/src/tool_setup.h
index c5c552c86636d15120ea388fe69259c6c9ba2bc6..648b0f2267fa10d9b62ee308b0f4f6f249a93057 100644 (file)
--- 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__)

diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c
index de815dce4e92633a16af4f97a47e2a87d2e2b22c..5e73f14766ac84ce90e2b65e153ffc13758756fe 100644 (file)
--- 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>
 

diff --git a/src/tool_vms.c b/src/tool_vms.c
index 9d9bcc1d498c758cb6e266074c4bdc08bbff962c..4a6a6f58e26b8945e4425e977a0b46c899b0f507 100644 (file)
--- 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"
 

diff --git a/src/tool_writeenv.c b/src/tool_writeenv.c
index 166e6d97f86bb558f478cc6b4f72943b565e39da..a9462d004292af6398790e3d5fb0880e0fe464c7 100644 (file)
--- 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>
 

diff --git a/src/tool_writeout.c b/src/tool_writeout.c
index 760d4bfb8fa10a3b7d6ac8b7749cd761fb592c2c..6038a210abbc58e93da0e0994b1b273a5e2d5f18 100644 (file)
--- 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>
 

diff --git a/src/tool_xattr.c b/src/tool_xattr.c
index 9c7e7049c46b94107ec3161ebd24efb9898516d4..505bdb17a6cf975c38172a776eaef819230c419c 100644 (file)
--- 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 */