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.
2024-12-21 23:58:49 -05:00 · 2013-01-06 19:06:49 +01:00 · 2013-01-06 19:06:49 +01:00 · 5a053ffe80
commit 5a053ffe80
parent e2bcd2ab9e
183 changed files with 197 additions and 208 deletions
--- 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.
--- 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 \
--- 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.
 */
--- 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

--- 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
--- 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.
--- a/lib/amigaos.c
+++ b/lib/amigaos.c
@ -20,7 +20,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #if defined(__AMIGA__) && !defined(__ixemul__)

--- 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__)

--- 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>
--- 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>
--- 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;
--- 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>
--- 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>
--- a/lib/bundles.c
+++ b/lib/bundles.c
@ -21,7 +21,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #include <curl/curl.h>

--- a/lib/conncache.c
+++ b/lib/conncache.c
@ -21,7 +21,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #include <curl/curl.h>

--- 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 */
--- 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"
--- a/lib/content_encoding.c
+++ b/lib/content_encoding.c
@ -20,7 +20,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifdef HAVE_LIBZ

--- 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)
--- 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)

--- 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>

--- 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>

--- 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>
--- 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

--- 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

--- 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"

--- 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"

--- a/lib/curl_gssapi.c
+++ b/lib/curl_gssapi.c
@ -20,7 +20,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifdef HAVE_GSSAPI

--- 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
--- 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 */
--- 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"

--- a/lib/curl_memrchr.h
+++ b/lib/curl_memrchr.h
@ -22,7 +22,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifdef HAVE_MEMRCHR

--- 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))

--- 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))

--- a/lib/curl_ntlm.c
+++ b/lib/curl_ntlm.c
@ -20,7 +20,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifdef USE_NTLM

--- a/lib/curl_ntlm.h
+++ b/lib/curl_ntlm.h
@ -22,7 +22,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifdef USE_NTLM

--- 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)

--- 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)

--- 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

--- 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

--- 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)

--- 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)

--- 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>

--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@ -20,7 +20,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifdef USE_LIBRTMP

--- 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"
--- 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

--- 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

--- a/lib/curl_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
--- a/lib/curl_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.
 */
--- 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

--- 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

--- 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
--- 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
--- a/lib/cyassl.c
+++ b/lib/cyassl.c
@ -26,7 +26,7 @@
 *
 */

-#include "setup.h"
+#include "curl_setup.h"

 #ifdef USE_CYASSL

--- 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

--- a/lib/dict.c
+++ b/lib/dict.c
@ -20,7 +20,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifndef CURL_DISABLE_DICT

--- 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>
--- 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>

--- a/lib/file.c
+++ b/lib/file.c
@ -20,7 +20,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifndef CURL_DISABLE_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"
--- a/lib/formdata.c
+++ b/lib/formdata.c
@ -20,7 +20,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #include <curl/curl.h>

--- a/lib/ftp.c
+++ b/lib/ftp.c
@ -20,7 +20,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifndef CURL_DISABLE_FTP

--- 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

--- 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

--- a/lib/getenv.c
+++ b/lib/getenv.c
@ -20,7 +20,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifdef __VMS
 #include <unixlib.h>
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@ -20,7 +20,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #include <curl/curl.h>

--- a/lib/gopher.c
+++ b/lib/gopher.c
@ -20,7 +20,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifndef CURL_DISABLE_GOPHER

--- 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.
--- a/lib/gtls.h
+++ b/lib/gtls.h
@ -22,7 +22,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifdef USE_GNUTLS

--- 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"
--- a/lib/hash.h
+++ b/lib/hash.h
@ -22,7 +22,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #include <stddef.h>

--- a/lib/hmac.c
+++ b/lib/hmac.c
@ -22,7 +22,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifndef CURL_DISABLE_CRYPTO_AUTH

--- 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>
--- 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 */
--- 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 */
--- 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"
--- 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>
--- 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>
--- 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>
--- a/lib/http.c
+++ b/lib/http.c
@ -20,7 +20,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifndef CURL_DISABLE_HTTP

--- 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

--- 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)

--- 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 */
--- 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
--- 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

--- 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)

--- 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

--- 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>
--- 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);
--- a/lib/imap.c
+++ b/lib/imap.c
@ -28,7 +28,7 @@
 *
 ***************************************************************************/

-#include "setup.h"
+#include "curl_setup.h"

 #ifndef CURL_DISABLE_IMAP

--- 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

--- 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);

--- 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

--- 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 *);

--- 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
--- 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
--- 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)

--- 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"
--- 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 *);
--- 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 */
--- a/Show More
+++ b/Show More