diff options
| author | Yang Tse <yangsita@gmail.com> | 2013-01-06 19:06:49 +0100 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2013-01-09 00:49:50 +0100 |
| commit | 5a053ffe80289b8472f88d7f11f29fbc98d4d9fd (patch) | |
| tree | 56a9a2ecdf9f5920a7d211f63c71baaf09b3a162 | |
| parent | e2bcd2ab9e5ad894a57756fa660d2a07b69171f4 (diff) | |
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.
183 files changed, 197 insertions, 208 deletions
diff --git a/docs/INSTALL b/docs/INSTALL index 0ed15ca29..a39f19c78 100644 --- 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 865f09371..cbfdac502 100644 --- 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 4e9c88003..7c2ede35b 100644 --- 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 bb7721d0e..3eb497798 100644 --- 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 f97ef6d0e..b116b3932 100644 --- 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 9723b93fd..2e30bc792 100644 --- 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 71ea704e1..34f95e9b5 100644 --- 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 7476a13d8..76578be86 100644 --- 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 44d00bdb0..fdfa2a30f 100644 --- 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 0d29d5887..7a8294ddf 100644 --- 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 e7c1b886d..1b681ea12 100644 --- 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 19ed73091..d512950c2 100644 --- 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 ec46c09ab..3f3f0f9b8 100644 --- 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 f09ee2a35..aadf02656 100644 --- 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 a3a90f879..165a26fb4 100644 --- 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 19f5b2f5b..acaf3b485 100644 --- 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 f84361f2e..ab9800289 100644 --- 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 3276ef988..c68e6e5f5 100644 --- 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 372da4a3b..501f6c8ce 100644 --- 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 644b33a25..18b91559c 100644 --- 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 5997e4680..d3b63f780 100644 --- 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 815b4ae64..10652c642 100644 --- 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 a5375cb33..6d2b753eb 100644 --- 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 2d56b3920..e8fa2758b 100644 --- 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 53053edca..183d9371c 100644 --- 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 e18f52eab..63f67b9aa 100644 --- 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 ddee4ba1d..ded1e6f94 100644 --- 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 b9c8ad0cf..fabbe3598 100644 --- 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 fd4596b80..ed33b51a2 100644 --- 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 6b6c16e13..b0be9cf6c 100644 --- 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 d79af9be7..a71c2bb4a 100644 --- 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 37061b608..324c73a7b 100644 --- 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 7cb9e4c60..6c02239eb 100644 --- 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 6ecccd3c9..7ee5eae12 100644 --- 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 9c7837254..72e446c8f 100644 --- 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 b2783778b..21a9e9e47 100644 --- 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 6b7d9fc46..8f3c00d64 100644 --- 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 5615b3504..9aa126bb2 100644 --- 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 8e788d733..93334c601 100644 --- 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 703fb75e1..e7d185dea 100644 --- 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 46a51c2c4..b1c20e1b3 100644 --- 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 e3eaffe17..db6bc16b7 100644 --- 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 047b7f345..dc49289a1 100644 --- 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 b87bdf2c7..45da35ca0 100644 --- 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 8062e53d2..7f998308d 100644 --- 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 8cb3af80f..b71d8d4b0 100644 --- 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 37126ac7d..b82c734a0 100644 --- 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 index 6d2dc90a8..37be5ae46 100644 --- 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 index 2d55c4060..57d3ea945 100644 --- 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 c3c41ec2f..e747d86b1 100644 --- 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 c3e6d9760..d52582856 100644 --- 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 411ccc81d..c9e91f63a 100644 --- 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 ba81054a2..d9cec6b29 100644 --- 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 13c0d135d..7c78464d8 100644 --- 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 56d68066f..7728a0cf5 100644 --- 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 ca5c362b1..f5c892197 100644 --- 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 b73bf6601..700fb327b 100644 --- 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 0dd5a1d0a..6a26cf8ef 100644 --- 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 886a09e24..038bf42e1 100644 --- 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 4ffcbbe29..8c8ee981a 100644 --- 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 7bf883941..6d78b795e 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include <curl/curl.h> @@ -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 49ee4b6a6..cb3601f58 100644 --- 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 8499ccda4..96764e2a4 100644 --- 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 a2d69830e..19da29a2d 100644 --- 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 221f05a4f..74e5b0893 100644 --- 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 e8f2790fc..b1dd65fff 100644 --- 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 8c2a4a0c9..700e46a9d 100644 --- 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 45b755a0e..84e1396b5 100644 --- 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 b59e56146..0a8e99ab2 100644 --- 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 3fa621cb1..99a627405 100644 --- 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 4df6f79ad..dace82037 100644 --- 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 93e2c31cd..8151b6714 100644 --- 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 8affce044..44ad822f0 100644 --- 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 2bfb74b42..3765ca1cd 100644 --- 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 de71f54f4..9dd47baa6 100644 --- 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 3babe7269..3a38b321f 100644 --- 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 5b25d6fc4..c42760a64 100644 --- 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 eff2efa7b..65a403545 100644 --- 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 0013e5065..21f7c21e6 100644 --- 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 d6a0bec13..e9fddf588 100644 --- 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 17cc95e81..f9f20d487 100644 --- 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 3b22ce10e..c6a4e9161 100644 --- 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 92c363d7c..535a4279e 100644 --- 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 5aa4f9433..1381d5292 100644 --- 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 d2e1aa199..ada89576e 100644 --- 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 9bc9cb810..464964bcd 100644 --- 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 c1905d175..558e30f15 100644 --- 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 70842457c..858ec2f5b 100644 --- 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 0fa1accd7..a53f2e9d2 100644 --- 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 1ff975667..c32715005 100644 --- 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 dbc146d91..db28ed807 100644 --- 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 d7fbbe957..f50b365da 100644 --- 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 f991473d6..43c549143 100644 --- 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 58354b602..3d789621d 100644 --- 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 c51041dda..1e99c709e 100644 --- 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 9ef31008c..833ffa445 100644 --- 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 a302e32d5..40bb62837 100644 --- 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 b4ca82a44..27ddb719a 100644 --- 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 *); @@ -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 */ @@ -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 c95f41fc5..4d5f44d2f 100644 --- 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 1716e3598..fbeb61de5 100644 --- 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 0990f4024..b5b81536a 100644 --- 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 dae1f6b56..de1fc7d6e 100644 --- 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 162a86caa..1b834b821 100644 --- 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 8e29227c0..91d6a54fc 100644 --- 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 6dcbe0044..8b4b7c22e 100644 --- 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 a2722ed7f..1447c877d 100644 --- 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> @@ -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 647b7bb28..a881a9ad2 100644 --- 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 c67342a08..252bf11ec 100644 --- 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 dd3291155..23ff2a717 100644 --- 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 9ccfa7fae..4c395fadc 100644 --- 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 b6079bc8f..1ddd0080a 100644 --- 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 85a7a45af..16b4ad37e 100644 --- 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 1d104cfbc..b48c1ed61 100644 --- 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 ef074be13..f4ca63e11 100644 --- 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 ad655465e..12b3db28c 100644 --- 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 dcb2e693f..e8fd9c52c 100644 --- 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 e73f01811..4cff2b76e 100644 --- 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 172df3141..8ef6fec8d 100644 --- 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 a523cb1f3..1fb47b829 100644 --- 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 2cf2fe7cb..e27dac4a8 100644 --- 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 ca9788ef7..9d7a9a94b 100644 --- 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 b70310b89..3c46953cb 100644 --- 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 32b6fa55f..d13e1228a 100644 --- 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 d66873fe9..00789bb89 100644 --- 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 b45e43a32..c64d686b9 100644 --- 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 39911d016..39489e40f 100644 --- 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 477c35b0b..b21c9f685 100644 --- 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 b9e6c2538..9a5128e93 100644 --- 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 4ddebb609..92c699ec9 100644 --- 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 9a759abca..2ad2ac691 100644 --- 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 522a2199f..6a2151c9d 100644 --- 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 13a756a40..51bb94664 100644 --- 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 0ce0bd044..dc4670b24 100644 --- 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 02dd485f1..1f840bd4e 100644 --- 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 6e95e3c35..b4b23e014 100644 --- 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 ca2323f57..ea17a5975 100644 --- 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 fc40e7d0c..786cd1215 100644 --- 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 b6664e6df..3570712d4 100644 --- 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 49a6dec41..5f9ef24cc 100644 --- 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 */ @@ -22,7 +22,7 @@ /* #define CURL_LIBSSH2_DEBUG */ -#include "setup.h" +#include "curl_setup.h" #ifdef USE_LIBSSH2 @@ -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 67dd71fa6..48758742a 100644 --- 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 2369b552c..17ad8e343 100644 --- 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 8f9fce4c8..c4c465c2c 100644 --- 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 5375a6a65..bdec2b513 100644 --- 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 27014354d..3b776b184 100644 --- 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 4edbcd7d4..49af9117e 100644 --- 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 89ad8a6e8..f69c5bf9e 100644 --- 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 0c82a53e4..58c6dc310 100644 --- 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 94eac0e64..0d31351f4 100644 --- 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 8baf77948..1147d70d3 100644 --- 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 c61459de8..03a97e8c4 100644 --- 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 08b0e6d91..b812a67a0 100644 --- 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 a64da090f..77d8b7b6b 100644 --- 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 97276ea99..282460bda 100644 --- 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 b464ae406..3f1b9ea70 100644 --- 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 6194908d6..6be43ea34 100644 --- 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" @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef HAVE_NETINET_IN_H #include <netinet/in.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 cd50f623f..576872d70 100644 --- 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 ef8353ae2..d39fe0c1d 100644 --- 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 9cc7be9d3..b1eaa96ea 100644 --- 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 6f4c7380c..7130d5e49 100644 --- 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 2e2d868d6..842cc4056 100644 --- 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 5527ce720..1dd3a7952 100644 --- 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 93f86cbad..bda835779 100644 --- 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 54162b3b5..7e98d115b 100644 --- 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 ed3849ba3..9ed726030 100644 --- 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 896686bd8..733cdd31b 100644 --- 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 df13df111..ba4097f8e 100644 --- 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 a18c92e8f..168294ab6 100644 --- 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 f131fe9fb..9da6a6730 100644 --- 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 fcc91ad8b..5de8c7c75 100644 --- 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 3ad18c987..b18a60734 100644 --- 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 0c6be2fc4..a236970a6 100644 --- 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 0401df215..69cc56cfc 100644 --- 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 d4ef252db..7533a98b7 100644 --- 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 193ad84d7..59e369586 100644 --- 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 eb29241ad..12d5fe314 100644 --- 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 |