build: fix circular header inclusion with other packages

This commit renames lib/setup.h to lib/curl_setup.h and
renames lib/setup_once.h to lib/curl_setup_once.h.

Removes the need and usage of a header inclusion guard foreign
to libcurl. [1]

Removes the need and presence of an alarming notice we carried
in old setup_once.h [2]

----------------------------------------

1 - lib/setup_once.h used __SETUP_ONCE_H macro as header inclusion guard
    up to commit ec691ca3 which changed this to HEADER_CURL_SETUP_ONCE_H,
    this single inclusion guard is enough to ensure that inclusion of
    lib/setup_once.h done from lib/setup.h is only done once.

    Additionally lib/setup.h has always used __SETUP_ONCE_H macro to
    protect inclusion of setup_once.h even after commit ec691ca3, this
    was to avoid a circular header inclusion triggered when building a
    c-ares enabled version with c-ares sources available which also has
    a setup_once.h header. Commit ec691ca3 exposes the real nature of
    __SETUP_ONCE_H usage in lib/setup.h, it is a header inclusion guard
    foreign to libcurl belonging to c-ares's setup_once.h

    The renaming this commit does, fixes the circular header inclusion,
    and as such removes the need and usage of a header inclusion guard
    foreign to libcurl. Macro __SETUP_ONCE_H no longer used in libcurl.

2 - Due to the circular interdependency of old lib/setup_once.h and the
    c-ares setup_once.h header, old file lib/setup_once.h has carried
    back from 2006 up to now days an alarming and prominent notice about
    the need of keeping libcurl's and c-ares's setup_once.h in sync.

    Given that this commit fixes the circular interdependency, the need
    and presence of mentioned notice is removed.

    All mentioned interdependencies come back from now old days when
    the c-ares project lived inside a curl subdirectory. This commit
    removes last traces of such fact.

diff --git a/docs/INSTALL b/docs/INSTALL
index 0ed15ca29087a17274049b68000111faf8917fa1..a39f19c784047255758f9264eb38a94f443c48ef 100644 (file)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -464,7 +464,7 @@ Win32
    possibilities:
 
    - Modify lib/config-win32.h
-   - Modify lib/setup.h
+   - Modify lib/curl_setup.h
    - Modify lib/Makefile.vc6
    - Add defines to Project/Settings/C/C++/General/Preprocessor Definitions
      in the vc6libcurl.dsw/vc6libcurl.dsp Visual C++ 6 IDE project.

diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index 865f0937123813814210b14e093d747578726453..cbfdac5025259b1b5653d028c4a4b25482dacae9 100644 (file)
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -31,7 +31,7 @@ EXTRA_DIST = README Makefile.example Makefile.inc Makefile.m32 \
 # might possibly already be installed in the system.
 #
 # $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
-# $(top_builddir)/include for generated curlbuild.h included from lib/setup.h
+# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h
 # $(top_srcdir)/include is for libcurl's external include files
 
 AM_CPPFLAGS = -I$(top_builddir)/include/curl \

diff --git a/include/curl/curlrules.h b/include/curl/curlrules.h
index 4e9c88003d489049e868af7be6f8a7da289110c6..7c2ede35b63a7540acd042ce5c2b27a70c982d02 100644 (file)
--- a/include/curl/curlrules.h
+++ b/include/curl/curlrules.h
@@ -190,7 +190,7 @@ typedef char
  * CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow
  * these to be visible and exported by the external libcurl interface API,
  * while also making them visible to the library internals, simply including
- * setup.h, without actually needing to include curl.h internally.
+ * curl_setup.h, without actually needing to include curl.h internally.
  * If some day this section would grow big enough, all this should be moved
  * to its own header file.
  */

diff --git a/lib/Makefile.am b/lib/Makefile.am
index bb7721d0e2d31253c35b9984f1635f9dffbb62bd..3eb497798ea4024ef164a2a9de584f1f458a9174 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -57,10 +57,10 @@ CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@
 # might possibly already be installed in the system.
 #
 # $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
-# $(top_builddir)/include for generated curlbuild.h included from lib/setup.h
+# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h
 # $(top_srcdir)/include is for libcurl's external include files
 # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
-# $(top_srcdir)/lib is for libcurl's lib/setup.h and other "private" files
+# $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "private" files
 # $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
 # $(top_srcdir)/ares is for in-tree c-ares's external include files
 

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index f97ef6d0ee24c7cecf31b7e54ac5be1c5bf5d335..b116b3932fe2acb2ff7626dfcd8b768bd52c5b5f 100644 (file)
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -34,13 +34,13 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h   \
   curl_fnmatch.h wildcard.h fileinfo.h ftplistparser.h strtok.h                \
   connect.h llist.h hash.h content_encoding.h share.h curl_md4.h       \
   curl_md5.h http_digest.h http_negotiate.h inet_pton.h amigaos.h      \
-  strtoofft.h strerror.h inet_ntop.h curlx.h curl_memory.h setup.h     \
+  strtoofft.h strerror.h inet_ntop.h curlx.h curl_memory.h curl_setup.h        \
   transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h   \
-  tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h \
+  tftp.h sockaddr.h splay.h strdup.h socks.h ssh.h nssg.h              \
   curl_base64.h rawstr.h curl_addrinfo.h curl_sspi.h slist.h nonblock.h        \
   curl_memrchr.h imap.h pop3.h smtp.h pingpong.h rtsp.h curl_threads.h \
   warnless.h curl_hmac.h polarssl.h curl_rtmp.h curl_gethostname.h     \
   gopher.h axtls.h cyassl.h http_proxy.h non-ascii.h asyn.h curl_ntlm.h        \
   curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h curl_ntlm_msgs.h       \
   curl_sasl.h curl_schannel.h curl_multibyte.h curl_darwinssl.h        \
-  hostcheck.h bundles.h conncache.h
+  hostcheck.h bundles.h conncache.h curl_setup_once.h

diff --git a/lib/README.hostip b/lib/README.hostip
index 9723b93fd8eefe183f124b935e7173f0a785065c..2e30bc792dda3e774eff77863ae6e635dbb39fc0 100644 (file)
--- a/lib/README.hostip
+++ b/lib/README.hostip
@@ -32,4 +32,4 @@
  hostip6.c  - ipv6-specific functions
 
  The hostip.h is the single united header file for all this. It defines the
- CURLRES_* defines based on the config*.h and setup.h defines.
+ CURLRES_* defines based on the config*.h and curl_setup.h defines.

diff --git a/lib/amigaos.c b/lib/amigaos.c
index 71ea704e17d3bca3fa3a37a420baae75f17a5cbb..34f95e9b5c26cdf8f8b328cd0ff142afb58f1f66 100644 (file)
--- a/lib/amigaos.c
+++ b/lib/amigaos.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(__AMIGA__) && !defined(__ixemul__)
 

diff --git a/lib/amigaos.h b/lib/amigaos.h
index 7476a13d8af47a6d3adadfa0c533f43c055f10a5..76578be868a68affdae17ebbc5f387b1370f6327 100644 (file)
--- a/lib/amigaos.h
+++ b/lib/amigaos.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(__AMIGA__) && !defined(__ixemul__)
 

diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index 44d00bdb060653e4229b3f351324d491512c33b1..fdfa2a30f9242a2713527ad8b002a7bf27f3388b 100644 (file)
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>

diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
index 0d29d58872fa1bdaffa2ef09054e1338fa519d6a..7a8294ddf528c4e58f588afd641fcd1eb70bfb79 100644 (file)
--- a/lib/asyn-thread.c
+++ b/lib/asyn-thread.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/lib/asyn.h b/lib/asyn.h
index e7c1b886d91baf40c088980d4dec61efffc4ed64..1b681ea12243610684584c04f48ffa6f695b3490 100644 (file)
--- a/lib/asyn.h
+++ b/lib/asyn.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 #include "curl_addrinfo.h"
 
 struct addrinfo;

diff --git a/lib/axtls.c b/lib/axtls.c
index 19ed730919676bc993c171e81b16ddbea72d34b3..d512950c2cad4512b4a3813ca586efcc8940b801 100644 (file)
--- a/lib/axtls.c
+++ b/lib/axtls.c
@@ -26,7 +26,7 @@
  * but sslgen.c should ever call or use these functions.
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_AXTLS
 #include <axTLS/ssl.h>

diff --git a/lib/base64.c b/lib/base64.c
index ec46c09abbc49e009301fd7d6de6b081bf68d364..3f3f0f9b8baaeb8346692e442d074a8ebd0f7d11 100644 (file)
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -22,7 +22,7 @@
 
 /* Base64 encoding/decoding */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>

diff --git a/lib/bundles.c b/lib/bundles.c
index f09ee2a35db81b5a32352778bf23c26bae0de11e..aadf02656ce84de5f75982110d94cecc9911da15 100644 (file)
--- a/lib/bundles.c
+++ b/lib/bundles.c
@@ -21,7 +21,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 

diff --git a/lib/conncache.c b/lib/conncache.c
index a3a90f87982dae7cc922c9be7aa706aad6182209..165a26fb4fd42e292eb0b57dfa41b163156de55d 100644 (file)
--- a/lib/conncache.c
+++ b/lib/conncache.c
@@ -21,7 +21,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 

diff --git a/lib/connect.c b/lib/connect.c
index 19f5b2f5bc1d1edc5984897bfaaa6e82a0e8d337..acaf3b485ba0ee2e6b4b28a87ca61316c8980e8e 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h> /* <netinet/tcp.h> may need it */

diff --git a/lib/connect.h b/lib/connect.h
index f84361f2e285331a14d436b7d5b38483796ce9a5..ab980028946a3697c1bab65ad739811bb474656c 100644 (file)
--- a/lib/connect.h
+++ b/lib/connect.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */
 #include "sockaddr.h"

diff --git a/lib/content_encoding.c b/lib/content_encoding.c
index 3276ef98886bb46979f80a2792be8decd6766295..c68e6e5f527c2dddf0cf3a86f74649accb7ca43f 100644 (file)
--- a/lib/content_encoding.c
+++ b/lib/content_encoding.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_LIBZ
 

diff --git a/lib/content_encoding.h b/lib/content_encoding.h
index 372da4a3bbfee130914dc3ff9798cc5b1d9b7a61..501f6c8cebd4084a0d5907e655ea84dbfe0ee15e 100644 (file)
--- a/lib/content_encoding.h
+++ b/lib/content_encoding.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 /*
  * Comma-separated list all supported Content-Encodings ('identity' is implied)

diff --git a/lib/cookie.c b/lib/cookie.c
index 644b33a2565700e3144b8f1341827767876e8245..18b91559ca07f505998f8873f0b855a8b2a422bf 100644 (file)
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -77,7 +77,7 @@ Example set of cookies:
 ****/
 
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)
 

diff --git a/lib/cookie.h b/lib/cookie.h
index 5997e4680fad4b95b17228b13b35cf182b23734e..d3b63f780fce06e7cbbd57b86ee98f9394748935 100644 (file)
--- a/lib/cookie.h
+++ b/lib/cookie.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 

diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 815b4ae6442182a19f3bd228c734d61d6f5df71b..10652c642c3082a340d6287d5d9d7d5df27add56 100644 (file)
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 

diff --git a/lib/curl_addrinfo.h b/lib/curl_addrinfo.h
index a5375cb33d9f17be521410660d02d317166dbbe0..6d2b753eb3d317f8b9d61d1a06a3d60d296d0a47 100644 (file)
--- a/lib/curl_addrinfo.h
+++ b/lib/curl_addrinfo.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>

diff --git a/lib/curl_darwinssl.c b/lib/curl_darwinssl.c
index 2d56b39208c9c89a98177250e7924cd75ca725a3..e8fa2758beea5423be59e7b57bfef049caf09959 100644 (file)
--- a/lib/curl_darwinssl.c
+++ b/lib/curl_darwinssl.c
@@ -26,7 +26,7 @@
  * TLS/SSL layer. No code but sslgen.c should ever call or use these functions.
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_DARWINSSL
 

diff --git a/lib/curl_darwinssl.h b/lib/curl_darwinssl.h
index 53053edca8e99c1507ae3eac6a2ef9ffe1ccea79..183d9371c7399a767880de14b9f62b41d23a9260 100644 (file)
--- a/lib/curl_darwinssl.h
+++ b/lib/curl_darwinssl.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_DARWINSSL
 

diff --git a/lib/curl_fnmatch.c b/lib/curl_fnmatch.c
index e18f52eabee7a41700c6063857a17c79fa37e443..63f67b9aa2bb3e73454cc27ff630a7b617bd18cc 100644 (file)
--- a/lib/curl_fnmatch.c
+++ b/lib/curl_fnmatch.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "curl_fnmatch.h"
 

diff --git a/lib/curl_gethostname.c b/lib/curl_gethostname.c
index ddee4ba1db7d9e77ab6e8ea534b4e77b42a5da11..ded1e6f948d2482dc3e04643024ccfbad1864580 100644 (file)
--- a/lib/curl_gethostname.c
+++ b/lib/curl_gethostname.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "curl_gethostname.h"
 

diff --git a/lib/curl_gssapi.c b/lib/curl_gssapi.c
index b9c8ad0cffe93ffacdecb3b297b0157cd8a097bc..fabbe35985bd78a9ba2c9abf8ecd09362136e243 100644 (file)
--- a/lib/curl_gssapi.c
+++ b/lib/curl_gssapi.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_GSSAPI
 

diff --git a/lib/curl_gssapi.h b/lib/curl_gssapi.h
index fd4596b80113ab07d83e9d9c3907fbf4ff283f5e..ed33b51a2d65292237cbe28137c11756e780dbb0 100644 (file)
--- a/lib/curl_gssapi.h
+++ b/lib/curl_gssapi.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 #include "urldata.h"
 
 #ifdef HAVE_GSSAPI

diff --git a/lib/curl_md4.h b/lib/curl_md4.h
index 6b6c16e134c5e6cd714ad83875e8348d2be7dd9d..b0be9cf6cf2883a6f63c097a579b2f09de52dd55 100644 (file)
--- a/lib/curl_md4.h
+++ b/lib/curl_md4.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 /* NSS crypto library does not provide the MD4 hash algorithm, so that we have
  * a local implementation of it */

diff --git a/lib/curl_memrchr.c b/lib/curl_memrchr.c
index d79af9be7492f1af194daf603370e97577275e3b..a71c2bb4ae62939bb0bfb5c7b28cb98e60d9b43b 100644 (file)
--- a/lib/curl_memrchr.c
+++ b/lib/curl_memrchr.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "curl_memrchr.h"
 

diff --git a/lib/curl_memrchr.h b/lib/curl_memrchr.h
index 37061b6082c92eafd0165839879c71bf366e7122..324c73a7b89fdda5aed0667b746069702a622395 100644 (file)
--- a/lib/curl_memrchr.h
+++ b/lib/curl_memrchr.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_MEMRCHR
 

diff --git a/lib/curl_multibyte.c b/lib/curl_multibyte.c
index 7cb9e4c60c8e43486641d7afccfbdbab19c44db1..6c02239eb005d2f16cc4a3363bf4e47d8301a9f1 100644 (file)
--- a/lib/curl_multibyte.c
+++ b/lib/curl_multibyte.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE))
 

diff --git a/lib/curl_multibyte.h b/lib/curl_multibyte.h
index 6ecccd3c93639347db2d6172b76ceef2e9aba046..7ee5eae1262fa82a23a2011d74fb7722486315e1 100644 (file)
--- a/lib/curl_multibyte.h
+++ b/lib/curl_multibyte.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE))
 

diff --git a/lib/curl_ntlm.c b/lib/curl_ntlm.c
index 9c7837254922383fc9414068f90e495496942fae..72e446c8fde8c60fa55800871c7ed13503ab77fc 100644 (file)
--- a/lib/curl_ntlm.c
+++ b/lib/curl_ntlm.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_NTLM
 

diff --git a/lib/curl_ntlm.h b/lib/curl_ntlm.h
index b2783778b36fb94924e7291bc7c1a3e2ef1c6dd3..21a9e9e47b4a580165a399ef44b8808b345de3bb 100644 (file)
--- a/lib/curl_ntlm.h
+++ b/lib/curl_ntlm.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_NTLM
 

diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
index 6b7d9fc466d1859ee4eca264323d9216259f88c4..8f3c00d64538c17651a860fe8618c16116a01263 100644 (file)
--- a/lib/curl_ntlm_core.c
+++ b/lib/curl_ntlm_core.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)
 

diff --git a/lib/curl_ntlm_core.h b/lib/curl_ntlm_core.h
index 5615b3504473cf24895234c833e65a6d2a310284..9aa126bb266f688ca4d542c7c7ce7c201552896d 100644 (file)
--- a/lib/curl_ntlm_core.h
+++ b/lib/curl_ntlm_core.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)
 

diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c
index 8e788d733f8ffd603887dead5de1defb612ad7b0..93334c6012770512e317585dd7df8fdfb73ab1b7 100644 (file)
--- a/lib/curl_ntlm_msgs.c
+++ b/lib/curl_ntlm_msgs.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_NTLM
 

diff --git a/lib/curl_ntlm_msgs.h b/lib/curl_ntlm_msgs.h
index 703fb75e1c9f3995e118d2cf1f92e093af01fff5..e7d185dea50b77ce707feb5f5add956eceb6cbbb 100644 (file)
--- a/lib/curl_ntlm_msgs.h
+++ b/lib/curl_ntlm_msgs.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_NTLM
 

diff --git a/lib/curl_ntlm_wb.c b/lib/curl_ntlm_wb.c
index 46a51c2c45af54bfa76adb22f945cdc7cdc7d1e2..b1c20e1b3bacda43d22a09160dfa454742cd0a62 100644 (file)
--- a/lib/curl_ntlm_wb.c
+++ b/lib/curl_ntlm_wb.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)
 

diff --git a/lib/curl_ntlm_wb.h b/lib/curl_ntlm_wb.h
index e3eaffe176af7592143feca9d7f3f63895a99365..db6bc16b73c95f6a9616379c47d3484426edd0da 100644 (file)
--- a/lib/curl_ntlm_wb.h
+++ b/lib/curl_ntlm_wb.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)
 

diff --git a/lib/curl_rand.c b/lib/curl_rand.c
index 047b7f345f3b0f99df751ff3bc313fbda672e1ab..dc49289a16c402431be7763dd0d2fee919205201 100644 (file)
--- a/lib/curl_rand.c
+++ b/lib/curl_rand.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 

diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
index b87bdf2c7f9a0d8ceded97943e6f868cdfa2a14b..45da35ca01febddaf1c84cf9beb7147d4621cfad 100644 (file)
--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_LIBRTMP
 

diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 8062e53d298a0abcacb5f05822514f59568333d0..7f998308d89614cdc25effe34525c30c6407810f 100644 (file)
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -25,7 +25,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 #include "urldata.h"

diff --git a/lib/curl_schannel.c b/lib/curl_schannel.c
index 8cb3af80fa2964eda20c81c2c9f00aa976ffae65..b71d8d4b07b0f25123d4359d11a05e78724a9823 100644 (file)
--- a/lib/curl_schannel.c
+++ b/lib/curl_schannel.c
@@ -51,7 +51,7 @@
  *   http://msdn.microsoft.com/en-us/library/windows/desktop/aa380161.aspx
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_SCHANNEL
 

diff --git a/lib/curl_schannel.h b/lib/curl_schannel.h
index 37126ac7d04d9b2ef66c43ae898907f86f859bd5..b82c734a0aa2695749332e5b4b82a39baa1d09a9 100644 (file)
--- a/lib/curl_schannel.h
+++ b/lib/curl_schannel.h
@@ -22,7 +22,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_SCHANNEL
 

diff --git a/lib/setup.h b/lib/curl_setup.h
similarity index 99%
rename from lib/setup.h
rename to lib/curl_setup.h
index 6d2dc90a8def63b5afef070fe0d60bfb2e2a6573..37be5ae46ef74bbe88b577a753f0dac7e6182d1c 100644 (file)
--- a/lib/setup.h
+++ b/lib/curl_setup.h
@@ -645,9 +645,7 @@ int netware_init(void);
  * Include macros and defines that should only be processed once.
  */
 
-#ifndef __SETUP_ONCE_H
-#include "setup_once.h"
-#endif
+#include "curl_setup_once.h"
 
 /*
  * Definition of our NOP statement Object-like macro

diff --git a/lib/setup_once.h b/lib/curl_setup_once.h
similarity index 96%
rename from lib/setup_once.h
rename to lib/curl_setup_once.h
index 2d55c40606c2181887fdceca22ba4dc63ba2d9da..57d3ea9452a05f36fd700fb6e4e2773a034dcda4 100644 (file)
--- a/lib/setup_once.h
+++ b/lib/curl_setup_once.h
@@ -23,16 +23,6 @@
  ***************************************************************************/
 
 
-/********************************************************************
- *                              NOTICE                              *
- *                             ========                             *
- *                                                                  *
- *  Content of header files lib/setup_once.h and ares/setup_once.h  *
- *  must be kept in sync. Modify the other one if you change this.  *
- *                                                                  *
- ********************************************************************/
-
-
 /*
  * Inclusion of common header files.
  */

diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c
index c3c41ec2f7dd6409178ea884155f36bb25915374..e747d86b1d2684053ec4b63365158ceff4f25992 100644 (file)
--- a/lib/curl_sspi.c
+++ b/lib/curl_sspi.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_WINDOWS_SSPI
 

diff --git a/lib/curl_sspi.h b/lib/curl_sspi.h
index c3e6d9760ccdac03852dbd978a5c3d7a8245df90..d52582856428d257b6f59ab4dcef6ea0977df7ad 100644 (file)
--- a/lib/curl_sspi.h
+++ b/lib/curl_sspi.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_WINDOWS_SSPI
 

diff --git a/lib/curl_threads.c b/lib/curl_threads.c
index 411ccc81d175182fbdee74712c70e705334ba418..c9e91f63abd39972c75545fd1562e46f811fd655 100644 (file)
--- a/lib/curl_threads.c
+++ b/lib/curl_threads.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_THREADS_POSIX)
 #  ifdef HAVE_PTHREAD_H

diff --git a/lib/curl_threads.h b/lib/curl_threads.h
index ba81054a25c6e076d6a258b26780f89cef50fa78..d9cec6b294197cd3fcae28931a8b0d472d07eb56 100644 (file)
--- a/lib/curl_threads.h
+++ b/lib/curl_threads.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_THREADS_POSIX)
 #  define CURL_STDCALL

diff --git a/lib/cyassl.c b/lib/cyassl.c
index 13c0d135d95b17f36c2b50b2a8ba0789253e1fa9..7c78464d8a1590d4639b45460c499bab9e23cf4b 100644 (file)
--- a/lib/cyassl.c
+++ b/lib/cyassl.c
@@ -26,7 +26,7 @@
  *
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_CYASSL
 

diff --git a/lib/cyassl.h b/lib/cyassl.h
index 56d68066f99385d7c0071dbe983aad7f9ab2bc70..7728a0cf57a098905781d68613de214f24abb2f8 100644 (file)
--- a/lib/cyassl.h
+++ b/lib/cyassl.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_CYASSL
 

diff --git a/lib/dict.c b/lib/dict.c
index ca5c362b18ca9a1102740e2c3414f71b1e36f531..f5c892197fb28d03f3517831dea9e5bc34ad8a58 100644 (file)
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_DICT
 

diff --git a/lib/easy.c b/lib/easy.c
index b73bf6601885adefd43e1503cd898e13ed1c1d50..700fb327be4e6cb3c89660fbec2973b65476c2e2 100644 (file)
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/lib/escape.c b/lib/escape.c
index 0dd5a1d0a687194492b2c38b54007de3e0775530..6a26cf8ef9ff0515c07cce92a63e16da66383c83 100644 (file)
--- a/lib/escape.c
+++ b/lib/escape.c
@@ -23,7 +23,7 @@
 /* Escape and unescape URL encoding in strings. The functions return a new
  * allocated string or NULL if an error occurred.  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 

diff --git a/lib/file.c b/lib/file.c
index 886a09e2498754f2c484404f588afb50a1c51409..038bf42e17b37785b9e5417cec6901623970a0b4 100644 (file)
--- a/lib/file.c
+++ b/lib/file.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_FILE
 

diff --git a/lib/fileinfo.c b/lib/fileinfo.c
index 4ffcbbe2983eb774e93ee5620175c2b7c35cb25b..8c8ee981a179e85f7934f465fe8c541135d735bd 100644 (file)
--- a/lib/fileinfo.c
+++ b/lib/fileinfo.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "strdup.h"
 #include "fileinfo.h"

diff --git a/lib/formdata.c b/lib/formdata.c
index 7bf8839414a826b3a96c6d4d232f396ee0d30f01..6d78b795e673fc4897d2ebf3efb9176e7e38d2ec 100644 (file)
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 

diff --git a/lib/ftp.c b/lib/ftp.c
index dc24d0bb5da45bad66ae4b90194a44ecd1b305e2..29b9743ec6f7706f50f514d5bba10ee3a85422d9 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_FTP
 

diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c
index 49ee4b6a6e5009e11522d21f44d14930d7520070..cb3601f58db850c869490d01ab41d0879544db0a 100644 (file)
--- a/lib/ftplistparser.c
+++ b/lib/ftplistparser.c
@@ -35,7 +35,7 @@
  * 01-29-97 11:32PM <DIR> prog
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_FTP
 

diff --git a/lib/ftplistparser.h b/lib/ftplistparser.h
index 8499ccda4d394a14fc1fda97596c80c766d60860..96764e2a41a119ee1862a833d7a94793e3db49a5 100644 (file)
--- a/lib/ftplistparser.h
+++ b/lib/ftplistparser.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_FTP
 

diff --git a/lib/getenv.c b/lib/getenv.c
index a2d69830e19b247053d928d9a68c3690d3caab8d..19da29a2d9799a3aecb28d93a4247c9d266fa051 100644 (file)
--- a/lib/getenv.c
+++ b/lib/getenv.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef __VMS
 #include <unixlib.h>

diff --git a/lib/getinfo.c b/lib/getinfo.c
index 221f05a4fab8256a6934894a53cf21e32f7e2c3e..74e5b0893db8098c786daa4d29a152b8174034ae 100644 (file)
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 

diff --git a/lib/gopher.c b/lib/gopher.c
index e8f2790fc485409d99d235c1de4dd58be8d6c07f..b1dd65fffeee0ce725b16e9a3540a9b1f8c34af4 100644 (file)
--- a/lib/gopher.c
+++ b/lib/gopher.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_GOPHER
 

diff --git a/lib/gtls.c b/lib/gtls.c
index 8c2a4a0c924d002d80a768bcf3874919ba904343..700e46a9da7662fed6baff9ebc2d28eaa465895f 100644 (file)
--- a/lib/gtls.c
+++ b/lib/gtls.c
@@ -28,7 +28,7 @@
  * since they were not present in 1.0.X.
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_GNUTLS
 
@@ -94,7 +94,8 @@ static bool gtls_inited = FALSE;
 /*
  * Custom push and pull callback functions used by GNU TLS to read and write
  * to the socket.  These functions are simple wrappers to send() and recv()
- * (although here using the sread/swrite macros as defined by setup_once.h).
+ * (although here using the sread/swrite macros as defined by
+ * curl_setup_once.h).
  * We use custom functions rather than the GNU TLS defaults because it allows
  * us to get specific about the fourth "flags" argument, and to use arbitrary
  * private data with gnutls_transport_set_ptr if we wish.

diff --git a/lib/gtls.h b/lib/gtls.h
index 45b755a0e18e33a420a7747dea35e27d96eef15e..84e1396b56ed7065442755f2e6729e3875702a93 100644 (file)
--- a/lib/gtls.h
+++ b/lib/gtls.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_GNUTLS
 

diff --git a/lib/hash.c b/lib/hash.c
index b59e56146741ef2d277c57d0401c78602f6d7c11..0a8e99ab2092e987f39436ae43b45a19423ce555 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "hash.h"
 #include "llist.h"

diff --git a/lib/hash.h b/lib/hash.h
index 3fa621cb1d333c77d2c91a7ecc70787ea4408379..99a627405bd34813bf280e3b1a109ed670813187 100644 (file)
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <stddef.h>
 

diff --git a/lib/hmac.c b/lib/hmac.c
index 4df6f79add8580c5750c41571a38a897b1ca1e49..dace820370eebd53bf092e65ef4d5cfac0740319 100644 (file)
--- a/lib/hmac.c
+++ b/lib/hmac.c
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_CRYPTO_AUTH
 

diff --git a/lib/hostasyn.c b/lib/hostasyn.c
index 93e2c31cd0ede1a5f0a4663fda7b32274417bdaf..8151b6714e09857c5f9e2b8651567973fc73f5b6 100644 (file)
--- a/lib/hostasyn.c
+++ b/lib/hostasyn.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/lib/hostcheck.c b/lib/hostcheck.c
index 8affce044c485cd50b00cd24161906371663dd19..44ad822f073c9084d99337751b0c155e5e0aad10 100644 (file)
--- a/lib/hostcheck.c
+++ b/lib/hostcheck.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_SSLEAY) || defined(USE_AXTLS)
 /* these two backends use functions from this file */

diff --git a/lib/hostip.c b/lib/hostip.c
index 2bfb74b42727d2661d1bdd284138118ca0f17536..3765ca1cde0de85de586311e9231bb24298ce47a 100644 (file)
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -106,7 +106,7 @@
  * asyn-thread.c - functions for threaded name resolves
 
  * The hostip.h is the united header file for all this. It defines the
- * CURLRES_* defines based on the config*.h and setup.h defines.
+ * CURLRES_* defines based on the config*.h and curl_setup.h defines.
  */
 
 /* These two symbols are for the global DNS cache */

diff --git a/lib/hostip.h b/lib/hostip.h
index de71f54f448d5fdefd616e1fd0aa225b989f9dc5..9dd47baa660026e6a6e08df8fa940df8f9c615ad 100644 (file)
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 #include "hash.h"
 #include "curl_addrinfo.h"
 #include "asyn.h"

diff --git a/lib/hostip4.c b/lib/hostip4.c
index 3babe72691bd29e2a6942a2f0ab13df86acba0ff..3a38b321f490418c6dac5a4058620324145fe5d4 100644 (file)
--- a/lib/hostip4.c
+++ b/lib/hostip4.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/lib/hostip6.c b/lib/hostip6.c
index 5b25d6fc408b4bf92353c0bb60104ac7b2f9a50b..c42760a64055f551da468a54b624299866455c7d 100644 (file)
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/lib/hostsyn.c b/lib/hostsyn.c
index eff2efa7bf816737a69a2704cd8889d1cc021d25..65a403545aece5eff74e1f27d03b5f16604e2fa3 100644 (file)
--- a/lib/hostsyn.c
+++ b/lib/hostsyn.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/lib/http.c b/lib/http.c
index 0013e50654d0a55cb3773a1542fbcc0d3708bd5d..21f7c21e6e1661a5f1f11dc64f4b0f0e3725388c 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_HTTP
 

diff --git a/lib/http_chunks.c b/lib/http_chunks.c
index d6a0bec13363ec2b44f8615dff8ac4737563fe49..e9fddf5889ecd2776fbab7597d3686ff64cb8a90 100644 (file)
--- a/lib/http_chunks.c
+++ b/lib/http_chunks.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_HTTP
 

diff --git a/lib/http_digest.c b/lib/http_digest.c
index 17cc95e812c74af923c71c1c340574d515cbaed0..f9f20d487f8c7c135956ff8ed4af683f2dc714f8 100644 (file)
--- a/lib/http_digest.c
+++ b/lib/http_digest.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH)
 

diff --git a/lib/http_digest.h b/lib/http_digest.h
index 3b22ce10eaf2801c591f4a78368bb4d76018f7fc..c6a4e916107f607f9f57e2ddaaa94807d3a9459d 100644 (file)
--- a/lib/http_digest.h
+++ b/lib/http_digest.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 typedef enum {
   CURLDIGEST_NONE, /* not a digest */

diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c
index 92c363d7cd0794b83424c98565cf45f82ff72a4a..535a4279e2d6475d4f55e56faccafbae2a57b588 100644 (file)
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_GSSAPI
 #ifdef HAVE_OLD_GSSMIT

diff --git a/lib/http_negotiate_sspi.c b/lib/http_negotiate_sspi.c
index 5aa4f9433b6d5540ca7d6e499af685f3adcecd9f..1381d5292d97d6ce63e009a467dbb629d0249f70 100644 (file)
--- a/lib/http_negotiate_sspi.c
+++ b/lib/http_negotiate_sspi.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_WINDOWS_SSPI
 

diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index d2e1aa199b86c0b8415f96723f36af0935a516d5..ada89576e170ef7fb70e1ed8f935bd4133a55b41 100644 (file)
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
 

diff --git a/lib/idn_win32.c b/lib/idn_win32.c
index 9bc9cb810b69d3a40910dd9546497595ba2f8789..464964bcd0de2924b75f0ea9a5d934b6dc850ca2 100644 (file)
--- a/lib/idn_win32.c
+++ b/lib/idn_win32.c
@@ -24,7 +24,7 @@
   * IDN conversions using Windows kernel32 and normaliz libraries.
   */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_WIN32_IDN
 

diff --git a/lib/if2ip.c b/lib/if2ip.c
index c1905d1757d84b2bb56daf63498e3cd8f4da32df..558e30f15fb356bbaf489e88c96dcbb059fbe8f5 100644 (file)
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>

diff --git a/lib/if2ip.h b/lib/if2ip.h
index 70842457cde772c54219ff9f3a95c536d0e633b4..858ec2f5b3b9b608a37012466d8873d3bb873111 100644 (file)
--- a/lib/if2ip.h
+++ b/lib/if2ip.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 bool Curl_if_is_interface_name(const char *interf);
 char *Curl_if2ip(int af, const char *interf, char *buf, int buf_size);

diff --git a/lib/imap.c b/lib/imap.c
index 0fa1accd73dd92604c149efcdfee6a706f8cc6e6..a53f2e9d243126f0b81bfab752464e9a61640976 100644 (file)
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -28,7 +28,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_IMAP
 

diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c
index 1ff975667805b85de11026cc2a77f7f07e8d38e1..c3271500556061140bbb96b50ba6023e113844c2 100644 (file)
--- a/lib/inet_ntop.c
+++ b/lib/inet_ntop.c
@@ -18,7 +18,7 @@
  * Original code by Paul Vixie. "curlified" by Gisle Vanem.
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef HAVE_INET_NTOP
 

diff --git a/lib/inet_ntop.h b/lib/inet_ntop.h
index dbc146d918e0e111bb40ba0e42d3cfbe4e1b9cba..db28ed807aac1e853111c7bb99c9c6c9e5773832 100644 (file)
--- a/lib/inet_ntop.h
+++ b/lib/inet_ntop.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 char *Curl_inet_ntop(int af, const void *addr, char *buf, size_t size);
 

diff --git a/lib/inet_pton.c b/lib/inet_pton.c
index d7fbbe9574f422b788e686f4ccb9623cba25d56f..f50b365da6d348fd337e1299b5687b4fa66f377d 100644 (file)
--- a/lib/inet_pton.c
+++ b/lib/inet_pton.c
@@ -16,7 +16,7 @@
  * SOFTWARE.
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef HAVE_INET_PTON
 

diff --git a/lib/inet_pton.h b/lib/inet_pton.h
index f991473d6b38dd297f1adb6fb3fc6b934efef164..43c549143076e41460738191ecd090deb3f339fd 100644 (file)
--- a/lib/inet_pton.h
+++ b/lib/inet_pton.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 int Curl_inet_pton(int, const char *, void *);
 

diff --git a/lib/krb4.c b/lib/krb4.c
index 58354b602cdc9e2ac5067bbd51b6d0959ab01c4d..3d789621d8e002df7b74696c2826e2d0c68665b2 100644 (file)
--- a/lib/krb4.c
+++ b/lib/krb4.c
@@ -39,7 +39,7 @@
  *
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_FTP
 #ifdef HAVE_KRB4

diff --git a/lib/krb5.c b/lib/krb5.c
index c51041ddafeb1f43dde21a6bc1daf9fafd7c925a..1e99c709e62f83c98885ad7b3bda72cb5e9702ce 100644 (file)
--- a/lib/krb5.c
+++ b/lib/krb5.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_FTP
 #ifdef HAVE_GSSAPI

diff --git a/lib/ldap.c b/lib/ldap.c
index 9ef31008c8308cd1c40e5484ab03cec620d35f2b..833ffa4453d74f2c32559dbd598f8690251eca44 100644 (file)
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_LDAP) && !defined(USE_OPENLDAP)
 

diff --git a/lib/llist.c b/lib/llist.c
index a302e32d56857d0fbf75cb6c4401dc76db980423..40bb6283799ac0d84d503f15d0267234f4729b1e 100644 (file)
--- a/lib/llist.c
+++ b/lib/llist.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "llist.h"
 #include "curl_memory.h"

diff --git a/lib/llist.h b/lib/llist.h
index b4ca82a4450f57b624dbc8a7a23fd0a2b9a13485..27ddb719a5cc0928bde01d34704ce80af1fd8f1d 100644 (file)
--- a/lib/llist.h
+++ b/lib/llist.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 #include <stddef.h>
 
 typedef void (*curl_llist_dtor)(void *, void *);

diff --git a/lib/md4.c b/lib/md4.c
index cf6c36023b13d01d8b77a8abc09059e74e8bb6cf..6930e021af929fd6cd819747e44d05334fb27621 100644 (file)
--- a/lib/md4.c
+++ b/lib/md4.c
@@ -20,7 +20,7 @@
    documentation and/or software.
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 /* NSS crypto library does not provide the MD4 hash algorithm, so that we have
  * a local implementation of it */

diff --git a/lib/md5.c b/lib/md5.c
index ae5812b956dc9d4cf0f6d14e88ea3f1d11890577..57efa431b52e48d8a1dcf658407c59a27c12d141 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_CRYPTO_AUTH
 

diff --git a/lib/memdebug.c b/lib/memdebug.c
index c95f41fc5bd23bc00d92cae1b82f335a07c1589f..4d5f44d2f0d5dd5d75011b78727db01f12873798 100644 (file)
--- a/lib/memdebug.c
+++ b/lib/memdebug.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef CURLDEBUG
 

diff --git a/lib/memdebug.h b/lib/memdebug.h
index 1716e3598709261ab716d63979add81b3edb2910..fbeb61de5d38a5e15ce465a10f80fdd52f5a9922 100644 (file)
--- a/lib/memdebug.h
+++ b/lib/memdebug.h
@@ -28,7 +28,7 @@
  * as well as the library. Do not mix with library internals!
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 

diff --git a/lib/mprintf.c b/lib/mprintf.c
index 0990f4024b782cd436a929c8ca92c1e437942b1a..b5b81536ab2d89541fbe5cb6941b540b5022cadd 100644 (file)
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -35,7 +35,7 @@
  * page at http://daniel.haxx.se/trio/
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(DJGPP) && (DJGPP_MINOR < 4)
 #undef _MPRINTF_REPLACE /* don't use x_was_used() here */

diff --git a/lib/multi.c b/lib/multi.c
index dae1f6b56af3775fd597d5abbaed23a618037a64..de1fc7d6ead8a49f9842a8c6f5d784fb6f66eab9 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 

diff --git a/lib/netrc.c b/lib/netrc.c
index 162a86caa036a011c0c623d19bc528262660c76e..1b834b821d3fe5475a8a2380aed4591132aba801 100644 (file)
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>

diff --git a/lib/non-ascii.c b/lib/non-ascii.c
index 8e29227c01879865d38be3bd13a6b0a9693ddfd2..91d6a54fcb4fcbca7f5ca9628ebc2e2f0f11fd2e 100644 (file)
--- a/lib/non-ascii.c
+++ b/lib/non-ascii.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef CURL_DOES_CONVERSIONS
 

diff --git a/lib/non-ascii.h b/lib/non-ascii.h
index 6dcbe00449dc6f6124eeb41a65532bf66db89c9e..8b4b7c22e8c416202cdf0b45ee7f2507388f0c8b 100644 (file)
--- a/lib/non-ascii.h
+++ b/lib/non-ascii.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef CURL_DOES_CONVERSIONS
 

diff --git a/lib/nonblock.c b/lib/nonblock.c
index a2722ed7fb4cd4821e36378eaa1a193dea36a15a..1447c877df4f8888bd1c138b1534c99db7291b52 100644 (file)
--- a/lib/nonblock.c
+++ b/lib/nonblock.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>

diff --git a/lib/nss.c b/lib/nss.c
index 86ce6a6d5ff0b4bb305f7f6adf7a1b14dbdca1d5..298ddad172546aae1073988d18126c285c6e9caf 100644 (file)
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -25,7 +25,7 @@
  * but sslgen.c should ever call or use these functions.
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_NSS
 

diff --git a/lib/nssg.h b/lib/nssg.h
index 647b7bb28e8fe278fa6472d8026765ba094430b3..a881a9ad2f2426781add4a52f05635b6ca901712 100644 (file)
--- a/lib/nssg.h
+++ b/lib/nssg.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_NSS
 /*

diff --git a/lib/nwlib.c b/lib/nwlib.c
index c67342a089bd0604ec13acc35af0388187e89cfa..252bf11ec871ddd0ed06b93c184533d56957ec4c 100644 (file)
--- a/lib/nwlib.c
+++ b/lib/nwlib.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef NETWARE /* Novell NetWare */
 

diff --git a/lib/nwos.c b/lib/nwos.c
index dd3291155242688af4d8c9b77e95dea25ee6cea7..23ff2a7172785aee4c463be8995a3d359947ec43 100644 (file)
--- a/lib/nwos.c
+++ b/lib/nwos.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef NETWARE /* Novell NetWare */
 

diff --git a/lib/openldap.c b/lib/openldap.c
index 9ccfa7faeb8dc935b106ecbd89f5e28674abff08..4c395fadc33014da48ea47c6c263f55343138497 100644 (file)
--- a/lib/openldap.c
+++ b/lib/openldap.c
@@ -21,7 +21,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP)
 

diff --git a/lib/parsedate.c b/lib/parsedate.c
index b6079bc8f4b8225f4f2b3883ce07411b98f501a4..1ddd0080ae87459b2dcd0743174a4cda894ba16b 100644 (file)
--- a/lib/parsedate.c
+++ b/lib/parsedate.c
@@ -73,7 +73,7 @@
 
 */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>

diff --git a/lib/pingpong.c b/lib/pingpong.c
index 85a7a45af70b21f8e07411485ee253657def417b..16b4ad37e4446183211c3c446d13274c956337e3 100644 (file)
--- a/lib/pingpong.c
+++ b/lib/pingpong.c
@@ -23,7 +23,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "urldata.h"
 #include "sendf.h"

diff --git a/lib/pingpong.h b/lib/pingpong.h
index 1d104cfbc32b81a2046b022edb205c09f1cd6574..b48c1ed61a505fc8438c35ac5815eb690a4490e4 100644 (file)
--- a/lib/pingpong.h
+++ b/lib/pingpong.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_FTP) || \
   !defined(CURL_DISABLE_POP3) || !defined(CURL_DISABLE_SMTP)

diff --git a/lib/polarssl.c b/lib/polarssl.c
index ef074be13297d3d44c97f43710682a5b1fa0c7f0..f4ca63e116bf43b81cf34795ee200bdf762231fe 100644 (file)
--- a/lib/polarssl.c
+++ b/lib/polarssl.c
@@ -27,7 +27,7 @@
  *
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_POLARSSL
 

diff --git a/lib/polarssl.h b/lib/polarssl.h
index ad655465e978b0907316115bca662c2e79a43ca3..12b3db28c00ec8993a8cedbdacd02d33ff8d1224 100644 (file)
--- a/lib/polarssl.h
+++ b/lib/polarssl.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_POLARSSL
 

diff --git a/lib/pop3.c b/lib/pop3.c
index dcb2e693f6c80d4b7d6dfec8c9e67ea1e10c257d..e8fd9c52c7dc064fd09e4179e02148f030180de2 100644 (file)
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -30,7 +30,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_POP3
 

diff --git a/lib/progress.c b/lib/progress.c
index e73f01811b3d1bb636155a10c12bbfe75a372cf4..4cff2b76ecb1c5234e550a39a9a7738accfdadb1 100644 (file)
--- a/lib/progress.c
+++ b/lib/progress.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "urldata.h"
 #include "sendf.h"

diff --git a/lib/qssl.c b/lib/qssl.c
index 172df31411239e4afe3a6076def75b5392bdac91..8ef6fec8d8e6d07e83dce011232d1289856fcb80 100644 (file)
--- a/lib/qssl.c
+++ b/lib/qssl.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_QSOSSL
 

diff --git a/lib/qssl.h b/lib/qssl.h
index a523cb1f30ab4e9b384468730864602d3927de78..1fb47b82995f2e4f15fd94003f7e4981a2a65889 100644 (file)
--- a/lib/qssl.h
+++ b/lib/qssl.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 /*
  * This header should only be needed to get included by sslgen.c and qssl.c

diff --git a/lib/rawstr.c b/lib/rawstr.c
index 2cf2fe7cbae6debddb185bccd295e152cecc21d1..e27dac4a80b0b9c668ed6a9426b292e1634872b1 100644 (file)
--- a/lib/rawstr.c
+++ b/lib/rawstr.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "rawstr.h"
 

diff --git a/lib/rtsp.c b/lib/rtsp.c
index ca9788ef78bb8f94c1d27184171edcb01fc90de9..9d7a9a94b0b7bfc0805964da961e4a81905f8645 100644 (file)
--- a/lib/rtsp.c
+++ b/lib/rtsp.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_RTSP
 

diff --git a/lib/security.c b/lib/security.c
index b70310b89eaa454996ef4f72d37cfde9ba03d15a..3c46953cbfc2c6049eee023582a2d5846114f32e 100644 (file)
--- a/lib/security.c
+++ b/lib/security.c
@@ -41,7 +41,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_FTP
 #if defined(HAVE_KRB4) || defined(HAVE_GSSAPI)

diff --git a/lib/select.c b/lib/select.c
index 32b6fa55ff70cc7d81a517bfbcce0c5c0b5fce1b..d13e1228ad2a5811161f1a8a5ce3963ef0e9b429 100644 (file)
--- a/lib/select.c
+++ b/lib/select.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>

diff --git a/lib/select.h b/lib/select.h
index d66873fe997f431bd961dce6b5ea5d2a741672b2..00789bb8945ac4fe6b244ce4cab82d98dcf124bd 100644 (file)
--- a/lib/select.h
+++ b/lib/select.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_SYS_POLL_H
 #include <sys/poll.h>

diff --git a/lib/sendf.c b/lib/sendf.c
index b45e43a3235154e26be912ea462116ba9512b945..c64d686b93384f135878176b303114726dbb4bf0 100644 (file)
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 

diff --git a/lib/sendf.h b/lib/sendf.h
index 39911d016edc67baf2fb9307c77b9afb689ea401..39489e40fbb18ed9bb0d78f750874e2e81788d23 100644 (file)
--- a/lib/sendf.h
+++ b/lib/sendf.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 CURLcode Curl_sendf(curl_socket_t sockfd, struct connectdata *,
                     const char *fmt, ...);

diff --git a/lib/share.c b/lib/share.c
index 477c35b0ba063860b3f31e46ce7c05a355f80f40..b21c9f68521e00aac21984733d33fe5084b390bd 100644 (file)
--- a/lib/share.c
+++ b/lib/share.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 #include "urldata.h"

diff --git a/lib/share.h b/lib/share.h
index b9e6c2538980d0a343fd33b804437eb1a3975a94..9a5128e931b607089e8195a7490529c3c3d255df 100644 (file)
--- a/lib/share.h
+++ b/lib/share.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 #include <curl/curl.h>
 #include "cookie.h"
 #include "urldata.h"

diff --git a/lib/slist.c b/lib/slist.c
index 4ddebb6091e5a8120c967813a28eea77f5bdd4ed..92c699ec965f73fa9b613341b5f38daff8015b97 100644 (file)
--- a/lib/slist.c
+++ b/lib/slist.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "curl_memory.h"
 #include "slist.h"

diff --git a/lib/smtp.c b/lib/smtp.c
index 9a759abca1dce664f0d80b361961f271590a011b..2ad2ac691742e9497229e316893f80fbe6d14dc4 100644 (file)
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -28,7 +28,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_SMTP
 

diff --git a/lib/sockaddr.h b/lib/sockaddr.h
index 522a2199f54a09143b37dfba23933082433ae329..6a2151c9d2f4ce65d85bb19ff550454b0631ca90 100644 (file)
--- a/lib/sockaddr.h
+++ b/lib/sockaddr.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 struct Curl_sockaddr_storage {
   union {

diff --git a/lib/socks.c b/lib/socks.c
index 13a756a408f8c22044f8842d3633031fafc97a76..51bb94664311b8033b1617fdbc930a112e05dfa9 100644 (file)
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_PROXY)
 

diff --git a/lib/socks.h b/lib/socks.h
index 0ce0bd044c6daaab5d89fc16da4422dc9e7d94ba..dc4670b24935409a8cd4907bc1828ec1c2814bac 100644 (file)
--- a/lib/socks.h
+++ b/lib/socks.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef CURL_DISABLE_PROXY
 #define Curl_SOCKS4(a,b,c,d,e,f) CURLE_NOT_BUILT_IN

diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index 02dd485f1b0344dfd2f57e2706e652bba6810323..1f840bd4e0678562d001083bdcbbcb77d937b59b 100644 (file)
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -21,7 +21,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_PROXY
 

diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index 6e95e3c35a5a957f444fff5a22079edf3b7c74aa..b4b23e01491f72144d37f97cfb35e98552059dcd 100644 (file)
--- a/lib/socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -21,7 +21,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_PROXY)
 

diff --git a/lib/speedcheck.c b/lib/speedcheck.c
index ca2323f57fb146569a7c9120e75ab55869265b2a..ea17a597544c5dc0aef3fde6196ed4b9cee813df 100644 (file)
--- a/lib/speedcheck.c
+++ b/lib/speedcheck.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 #include "urldata.h"

diff --git a/lib/speedcheck.h b/lib/speedcheck.h
index fc40e7d0cc7e262e8692fc6c1b312eb8267d6357..786cd1215a357e1777c568030999560302b04f48 100644 (file)
--- a/lib/speedcheck.h
+++ b/lib/speedcheck.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "timeval.h"
 

diff --git a/lib/splay.c b/lib/splay.c
index b6664e6df34a3be36a56e5b9d9accbc4e0f2a46e..3570712d4359ce2ac84498b252669ee7fed4f61b 100644 (file)
--- a/lib/splay.c
+++ b/lib/splay.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "splay.h"
 

diff --git a/lib/splay.h b/lib/splay.h
index 49a6dec41dfb2b4b24175b3531e56628f16c6f46..5f9ef24cc6e4b5b49c0539ebe54b932bdf8087c6 100644 (file)
--- a/lib/splay.h
+++ b/lib/splay.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 struct Curl_tree {
   struct Curl_tree *smaller; /* smaller node */

diff --git a/lib/ssh.c b/lib/ssh.c
index 1cc4bcd4cf2b94870dc460946e8291ddf8755058..8eb2e9fc9becb42771defde006cbe924122abc3b 100644 (file)
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -22,7 +22,7 @@
 
 /* #define CURL_LIBSSH2_DEBUG */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_LIBSSH2
 

diff --git a/lib/ssh.h b/lib/ssh.h
index bf43fdf3a1a4c7aee9a80fbac416c79fb3ff74e3..ff2e16be941ea62e235429dafd473a845e03cc66 100644 (file)
--- a/lib/ssh.h
+++ b/lib/ssh.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_LIBSSH2_H
 #include <libssh2.h>

diff --git a/lib/sslgen.c b/lib/sslgen.c
index 67dd71fa64277fbde05e2ea09e901351eda2b6bb..48758742a2072c8a5a50e23fbb273a325655cbfe 100644 (file)
--- a/lib/sslgen.c
+++ b/lib/sslgen.c
@@ -43,7 +43,7 @@
    http://httpd.apache.org/docs-2.0/ssl/ssl_intro.html
 */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "urldata.h"
 #define SSLGEN_C

diff --git a/lib/sslgen.h b/lib/sslgen.h
index 2369b552cf26fd052f5942b98e3bfc82e9be7b09..17ad8e343d8283c4df7497f475210a2f513f4c1f 100644 (file)
--- a/lib/sslgen.h
+++ b/lib/sslgen.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef MD5_DIGEST_LENGTH
 #define MD5_DIGEST_LENGTH 16 /* fixed size */

diff --git a/lib/ssluse.c b/lib/ssluse.c
index 8f9fce4c87b8eff1bcea1681fae8b189aa7125ad..c4c465c2c76a3959ed7a2946fdee994e5eb12aff 100644 (file)
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -30,7 +30,7 @@
  * Sampo Kellomaki 1998.
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>

diff --git a/lib/ssluse.h b/lib/ssluse.h
index 5375a6a65de7e3a28b221010d18d4713cf3dbad9..bdec2b513eb123cd0964c9b087087824b2b3f98f 100644 (file)
--- a/lib/ssluse.h
+++ b/lib/ssluse.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_SSLEAY
 /*

diff --git a/lib/strdup.c b/lib/strdup.c
index 27014354d79c84932929b550fc4e785efeaee110..3b776b1845868a1be04c71fc257bc1887edbb330 100644 (file)
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -22,7 +22,7 @@
 /*
  * This file is 'mem-include-scan' clean. See test 1132.
  */
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "strdup.h"
 

diff --git a/lib/strdup.h b/lib/strdup.h
index 4edbcd7d4e476366c64e73cc644507921bf4b249..49af9117ee90f2959351d6f142714260e2bb5fa3 100644 (file)
--- a/lib/strdup.h
+++ b/lib/strdup.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef HAVE_STRDUP
 extern char *curlx_strdup(const char *str);

diff --git a/lib/strequal.c b/lib/strequal.c
index 89ad8a6e8defcef8d551569e789fa29734f89278..f69c5bf9e75f3c014c3c2584e51abadc54a0c312 100644 (file)
--- a/lib/strequal.c
+++ b/lib/strequal.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>

diff --git a/lib/strerror.c b/lib/strerror.c
index 0c82a53e4c8945213efe9d71d4f62d215ada2d23..58c6dc310b3d84fe23e92d6fcb004ba9a7f2e6a6 100644 (file)
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_STRERROR_R
 #  if (!defined(HAVE_POSIX_STRERROR_R) && \

diff --git a/lib/strtok.c b/lib/strtok.c
index 94eac0e642c3d61ab4ccca5926da51c4e49838e8..0d31351f48f1d2bd2f566fa4447b89087d62c944 100644 (file)
--- a/lib/strtok.c
+++ b/lib/strtok.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef HAVE_STRTOK_R
 #include <stddef.h>

diff --git a/lib/strtok.h b/lib/strtok.h
index 8baf77948f6bc29433cf660c49c203c2394cce8d..1147d70d3c2bbdcfdb57205b06d23c8e2b99058c 100644 (file)
--- a/lib/strtok.h
+++ b/lib/strtok.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 #include <stddef.h>
 
 #ifndef HAVE_STRTOK_R

diff --git a/lib/strtoofft.c b/lib/strtoofft.c
index c61459de89f82060f918eac8bce671b507de7f32..03a97e8c4d58300e9f33dfbcdf9d5d1e9e7968cc 100644 (file)
--- a/lib/strtoofft.c
+++ b/lib/strtoofft.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "strtoofft.h"
 

diff --git a/lib/strtoofft.h b/lib/strtoofft.h
index 08b0e6d91e2d2bfc173f7a6ecc5163915980db01..b812a67a0a85a67d6d72fd87e18a2a41d920e412 100644 (file)
--- a/lib/strtoofft.h
+++ b/lib/strtoofft.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 /*
  * Determine which string to integral data type conversion function we use

diff --git a/lib/telnet.c b/lib/telnet.c
index a64da090f2e071bc42ca580739a8e6dae5389814..77d8b7b6b59917ef5ba385ff938960521b340072 100644 (file)
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_TELNET
 

diff --git a/lib/tftp.c b/lib/tftp.c
index 97276ea99ab3234d6c8948d111839a3e39ea8cfa..282460bdaa5810d5048550f3decadf2a24de7b42 100644 (file)
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_TFTP
 

diff --git a/lib/timeval.h b/lib/timeval.h
index b464ae4068919e07f8bd19a652fa248ef9a522f7..3f1b9ea70d8a4ac9e766dcce69ef4234b26859ce 100644 (file)
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -27,7 +27,7 @@
  * as well as the library. Do not mix with library internals!
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 struct timeval curlx_tvnow(void);
 

diff --git a/lib/transfer.c b/lib/transfer.c
index 6194908d648c98ba268c7134cc13e88f297052ec..6be43ea34d39fa2b2f8b3d52f68b2c3f1d1a6926 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "strtoofft.h"
 #include "strequal.h"

diff --git a/lib/url.c b/lib/url.c
index 58befecab26fa160ec8f91afe5002da9d5fb968b..c107d2c51fb206d8693585e72e14089dd023bd01 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/lib/url.h b/lib/url.h
index ab6d3d04834cfd6df36776afacb45d9b7ce85568..a026e90e8535c8cd6272d6adf74abea8e9703041 100644 (file)
--- a/lib/url.h
+++ b/lib/url.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 /*
  * Prototypes for library-wide functions provided by url.c

diff --git a/lib/urldata.h b/lib/urldata.h
index cd50f623fcabaf64ca9ee2d53a24c186168296b8..576872d70f84b311f2aa85a44baf339615eb48fc 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -24,7 +24,7 @@
 
 /* This file is for lib internal stuff */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #define PORT_FTP 21
 #define PORT_FTPS 990

diff --git a/lib/version.c b/lib/version.c
index ef8353ae2a08eb94df007e8f2267294eb0470454..d39fe0c1d0ee64a3b46c91dee2ac8ccac82057fe 100644 (file)
--- a/lib/version.c
+++ b/lib/version.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 #include "urldata.h"

diff --git a/lib/warnless.c b/lib/warnless.c
index 9cc7be9d3fc7d1b9198ddcd37014e44d82075595..b1eaa96ea133258af4150a57d5c6006bf4a02781 100644 (file)
--- a/lib/warnless.c
+++ b/lib/warnless.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(__INTEL_COMPILER) && defined(__unix__)
 

diff --git a/lib/wildcard.c b/lib/wildcard.c
index 6f4c7380c4aa430c66d8c69dfd536b9d504386b4..7130d5e49473a415c78cbd3cfa464995a4e0dda8 100644 (file)
--- a/lib/wildcard.c
+++ b/lib/wildcard.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "wildcard.h"
 #include "llist.h"

diff --git a/m4/curl-reentrant.m4 b/m4/curl-reentrant.m4
index 2e2d868d6632aeb393c2ce2f0d95626eb56473a8..842cc4056de643e0f69c1bb3c7c2477adebd4260 100644 (file)
--- a/m4/curl-reentrant.m4
+++ b/m4/curl-reentrant.m4
@@ -21,7 +21,7 @@
 #***************************************************************************
 
 # File version for 'aclocal' use. Keep it a single number.
-# serial 8
+# serial 10
 
 dnl Note 1
 dnl ------
@@ -467,7 +467,7 @@ dnl This macro ensures that configuration tests done
 dnl after this will execute with preprocessor symbol
 dnl _REENTRANT defined. This macro also ensures that
 dnl the generated config file defines NEED_REENTRANT
-dnl and that in turn setup.h will define _REENTRANT.
+dnl and that in turn curl_setup.h will define _REENTRANT.
 dnl Internal macro for CURL_CONFIGURE_REENTRANT.
 
 AC_DEFUN([CURL_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT], [
@@ -487,7 +487,7 @@ dnl This macro ensures that configuration tests done
 dnl after this will execute with preprocessor symbol
 dnl _THREAD_SAFE defined. This macro also ensures that
 dnl the generated config file defines NEED_THREAD_SAFE
-dnl and that in turn setup.h will define _THREAD_SAFE.
+dnl and that in turn curl_setup.h will define _THREAD_SAFE.
 dnl Internal macro for CURL_CONFIGURE_THREAD_SAFE.
 
 AC_DEFUN([CURL_CONFIGURE_FROM_NOW_ON_WITH_THREAD_SAFE], [

diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c
index 5527ce7201b8092db5a7c1a803f01b0123d40f45..1dd3a795236010281c484d8cc7285b4c4a089912 100644 (file)
--- a/packages/OS400/os400sys.c
+++ b/packages/OS400/os400sys.c
@@ -24,7 +24,7 @@
 /* OS/400 additional support. */
 
 #include "curlbuild.h"
-#include "config-os400.h"       /* Not setup.h: we only need some defines. */
+#include "config-os400.h"  /* Not curl_setup.h: we only need some defines. */
 
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 93f86cbad43d06ff7115ecbf2255484b022e6643..bda83577993fd4c1fef0496ce3b83c0efd16405b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,8 +25,8 @@ source_group("cURL source files" FILES ${CURL_CFILES})
 source_group("cURL header files" FILES ${CURL_HFILES})
 
 include_directories(
-  ${CURL_SOURCE_DIR}/lib                # To be able to reach "setup_once.h"
-  ${CURL_BINARY_DIR}/lib                # To be able to reach "curl_config.h"
+  ${CURL_SOURCE_DIR}/lib        # To be able to reach "curl_setup_once.h"
+  ${CURL_BINARY_DIR}/lib        # To be able to reach "curl_config.h"
   ${CURL_BINARY_DIR}/include    # To be able to reach "curl/curlbuild.h"
   )
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 54162b3b51f5f48a41d0aab866a6ac1c479c5782..7e98d115bafe9c108e27bd6a2cf6f1ea1f73ca3e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,11 +27,11 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 # might possibly already be installed in the system.
 #
 # $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
-# $(top_builddir)/include for generated curlbuild.h included from lib/setup.h
+# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h
 # $(top_srcdir)/include is for libcurl's external include files
 # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
 # $(top_builddir)/src is for curl's generated src/curl_config.h file
-# $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files
+# $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
 # $(top_srcdir)/src is for curl's src/tool_setup.h and "curl-private" files
 
 AM_CPPFLAGS = -I$(top_builddir)/include/curl \

diff --git a/src/tool_setup.h b/src/tool_setup.h
index ed3849ba35632f1f2e6cb1246b0c746cf9fc997a..9ed7260300b016d81063182ccd0dd1bb0613fcc7 100644 (file)
--- a/src/tool_setup.h
+++ b/src/tool_setup.h
@@ -33,7 +33,7 @@
  * therefore we must include setup.h before curl.h when building curl.
  */
 
-#include "setup.h" /* from the lib directory */
+#include "curl_setup.h" /* from the lib directory */
 
 /*
  * curl tool certainly uses libcurl's external interface.

diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index 896686bd8be4caa1fcb89c69f11421562cc35310..733cdd31b922cf45812257f40903d60ceb3dff39 100644 (file)
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -5,7 +5,7 @@ function(SETUP_TEST TEST_NAME)          # ARGN are the files in the test
   string(TOUPPER ${TEST_NAME} UPPER_TEST_NAME)
 
   include_directories(
-    ${CURL_SOURCE_DIR}/lib          # To be able to reach "setup_once.h"
+    ${CURL_SOURCE_DIR}/lib          # To be able to reach "curl_setup_once.h"
     ${CURL_BINARY_DIR}/lib          # To be able to reach "curl_config.h"
     ${CURL_BINARY_DIR}/include      # To be able to reach "curl/curlbuild.h"
     )

diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index df13df1110dbffb70dbf32310c97412be898ffb5..ba4097f8ec36c136958d97daa46377628be835ad 100644 (file)
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -27,10 +27,10 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 # might possibly already be installed in the system.
 #
 # $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
-# $(top_builddir)/include for generated curlbuild.h included from lib/setup.h
+# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h
 # $(top_srcdir)/include is for libcurl's external include files
 # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
-# $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files
+# $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
 # $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
 # $(top_srcdir)/ares is for in-tree c-ares's external include files
 

diff --git a/tests/libtest/chkhostname.c b/tests/libtest/chkhostname.c
index a18c92e8f1aa0bcb924212d18d9d8b7da9c42ed8..168294ab6b91960ac3f71af36b259f0fbe77780c 100644 (file)
--- a/tests/libtest/chkhostname.c
+++ b/tests/libtest/chkhostname.c
@@ -19,7 +19,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "curl_gethostname.h"
 

diff --git a/tests/libtest/sethostname.c b/tests/libtest/sethostname.c
index f131fe9fb3a8625163b0633ee759c8aaeaaf0125..9da6a67307f88fed87e7fbb5d65c1d62d2437860 100644 (file)
--- a/tests/libtest/sethostname.c
+++ b/tests/libtest/sethostname.c
@@ -19,7 +19,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "sethostname.h"
 

diff --git a/tests/libtest/test.h b/tests/libtest/test.h
index fcc91ad8bfc82eae717803c2b1d5b86ce189554c..5de8c7c75b565367c27996b91754d9521e42d083 100644 (file)
--- a/tests/libtest/test.h
+++ b/tests/libtest/test.h
@@ -20,14 +20,14 @@
  *
  ***************************************************************************/
 
-/* Now include the setup.h file from libcurl's private libdir (the source
+/* Now include the curl_setup.h file from libcurl's private libdir (the source
    version, but that might include "curl_config.h" from the build dir so we
    need both of them in the include path), so that we get good in-depth
    knowledge about the system we're building this on */
 
 #define CURL_NO_OLDIES
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 

diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c
index 3ad18c98731789cb0e540d2af69be7d731fa21e8..b18a60734f88337f8885c9e2bdf714f0ddddbbcd 100644 (file)
--- a/tests/libtest/testutil.c
+++ b/tests/libtest/testutil.c
@@ -19,7 +19,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "testutil.h"
 #include "memdebug.h"

diff --git a/tests/libtest/testutil.h b/tests/libtest/testutil.h
index 0c6be2fc432d702a6862cd4f3158fe23c370d0a0..a236970a6784c84fa0d3ec8628760fd83393be60 100644 (file)
--- a/tests/libtest/testutil.h
+++ b/tests/libtest/testutil.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 struct timeval tutil_tvnow(void);
 

diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index 0401df215664c1e24caf559dbe8cb7a142ea35ef..69cc56cfc8c1f94251cf1341081e72e91d16ee44 100644 (file)
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -5,8 +5,8 @@ function(SETUP_EXECUTABLE TEST_NAME)    # ARGN are the files in the test
   string(TOUPPER ${TEST_NAME} UPPER_TEST_NAME)
 
   include_directories(
-    ${CURL_SOURCE_DIR}/lib              # To be able to reach "setup_once.h"
-    ${CURL_BINARY_DIR}/lib              # To be able to reach "curl_config.h"
+    ${CURL_SOURCE_DIR}/lib      # To be able to reach "curl_setup_once.h"
+    ${CURL_BINARY_DIR}/lib      # To be able to reach "curl_config.h"
     ${CURL_BINARY_DIR}/include  # To be able to reach "curl/curlbuild.h"
     )
   if(CURL_USE_ARES)

diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index d4ef252db13f697919931c52ed009c326f2a6e78..7533a98b7d06b61acd9ea3ca7535212afb55453a 100644 (file)
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -27,10 +27,10 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 # might possibly already be installed in the system.
 #
 # $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
-# $(top_builddir)/include for generated curlbuild.h included from lib/setup.h
+# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h
 # $(top_srcdir)/include is for libcurl's external include files
 # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
-# $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files
+# $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
 # $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
 # $(top_srcdir)/ares is for in-tree c-ares's external include files
 

diff --git a/tests/server/server_setup.h b/tests/server/server_setup.h
index 193ad84d70ca7a28cfaaa29ef18f4a8bb4ba26ab..59e369586b895bddd58aa7d840ee7a73d10e361f 100644 (file)
--- a/tests/server/server_setup.h
+++ b/tests/server/server_setup.h
@@ -24,6 +24,6 @@
 
 #define CURL_NO_OLDIES
 
-#include "setup.h" /* portability help from the lib directory */
+#include "curl_setup.h" /* portability help from the lib directory */
 
 #endif /* HEADER_CURL_SERVER_SETUP_H */

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index eb29241ad43cfdd867d698b9388512486c470071..12d5fe314a1ac0ce012bc8c455889e1741bde2b8 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -27,10 +27,10 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 # might possibly already be installed in the system.
 #
 # $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
-# $(top_builddir)/include for generated curlbuild.h included from lib/setup.h
+# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h
 # $(top_srcdir)/include is for libcurl's external include files
 # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
-# $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files
+# $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
 # $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
 # $(top_srcdir)/ares is for in-tree c-ares's external include files