Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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 ec691ca 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 ec691ca, 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 ec691ca 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.
  • Loading branch information...
commit 5a053ffe80289b8472f88d7f11f29fbc98d4d9fd 1 parent e2bcd2a
@yangtse yangtse authored
Showing with 197 additions and 208 deletions.
  1. +1 −1  docs/INSTALL
  2. +1 −1  docs/examples/Makefile.am
  3. +1 −1  include/curl/curlrules.h
  4. +2 −2 lib/Makefile.am
  5. +3 −3 lib/Makefile.inc
  6. +1 −1  lib/README.hostip
  7. +1 −1  lib/amigaos.c
  8. +1 −1  lib/amigaos.h
  9. +1 −1  lib/asyn-ares.c
  10. +1 −1  lib/asyn-thread.c
  11. +1 −1  lib/asyn.h
  12. +1 −1  lib/axtls.c
  13. +1 −1  lib/base64.c
  14. +1 −1  lib/bundles.c
  15. +1 −1  lib/conncache.c
  16. +1 −1  lib/connect.c
  17. +1 −1  lib/connect.h
  18. +1 −1  lib/content_encoding.c
  19. +1 −1  lib/content_encoding.h
  20. +1 −1  lib/cookie.c
  21. +1 −1  lib/cookie.h
  22. +1 −1  lib/curl_addrinfo.c
  23. +1 −1  lib/curl_addrinfo.h
  24. +1 −1  lib/curl_darwinssl.c
  25. +1 −1  lib/curl_darwinssl.h
  26. +1 −1  lib/curl_fnmatch.c
  27. +1 −1  lib/curl_gethostname.c
  28. +1 −1  lib/curl_gssapi.c
  29. +1 −1  lib/curl_gssapi.h
  30. +1 −1  lib/curl_md4.h
  31. +1 −1  lib/curl_memrchr.c
  32. +1 −1  lib/curl_memrchr.h
  33. +1 −1  lib/curl_multibyte.c
  34. +1 −1  lib/curl_multibyte.h
  35. +1 −1  lib/curl_ntlm.c
  36. +1 −1  lib/curl_ntlm.h
  37. +1 −1  lib/curl_ntlm_core.c
  38. +1 −1  lib/curl_ntlm_core.h
  39. +1 −1  lib/curl_ntlm_msgs.c
  40. +1 −1  lib/curl_ntlm_msgs.h
  41. +1 −1  lib/curl_ntlm_wb.c
  42. +1 −1  lib/curl_ntlm_wb.h
  43. +1 −1  lib/curl_rand.c
  44. +1 −1  lib/curl_rtmp.c
  45. +1 −1  lib/curl_sasl.c
  46. +1 −1  lib/curl_schannel.c
  47. +1 −1  lib/curl_schannel.h
  48. +1 −3 lib/{setup.h → curl_setup.h}
  49. +0 −10 lib/{setup_once.h → curl_setup_once.h}
  50. +1 −1  lib/curl_sspi.c
  51. +1 −1  lib/curl_sspi.h
  52. +1 −1  lib/curl_threads.c
  53. +1 −1  lib/curl_threads.h
  54. +1 −1  lib/cyassl.c
  55. +1 −1  lib/cyassl.h
  56. +1 −1  lib/dict.c
  57. +1 −1  lib/easy.c
  58. +1 −1  lib/escape.c
  59. +1 −1  lib/file.c
  60. +1 −1  lib/fileinfo.c
  61. +1 −1  lib/formdata.c
  62. +1 −1  lib/ftp.c
  63. +1 −1  lib/ftplistparser.c
  64. +1 −1  lib/ftplistparser.h
  65. +1 −1  lib/getenv.c
  66. +1 −1  lib/getinfo.c
  67. +1 −1  lib/gopher.c
  68. +3 −2 lib/gtls.c
  69. +1 −1  lib/gtls.h
  70. +1 −1  lib/hash.c
  71. +1 −1  lib/hash.h
  72. +1 −1  lib/hmac.c
  73. +1 −1  lib/hostasyn.c
  74. +1 −1  lib/hostcheck.c
  75. +2 −2 lib/hostip.c
  76. +1 −1  lib/hostip.h
  77. +1 −1  lib/hostip4.c
  78. +1 −1  lib/hostip6.c
  79. +1 −1  lib/hostsyn.c
  80. +1 −1  lib/http.c
  81. +1 −1  lib/http_chunks.c
  82. +1 −1  lib/http_digest.c
  83. +1 −1  lib/http_digest.h
  84. +1 −1  lib/http_negotiate.c
  85. +1 −1  lib/http_negotiate_sspi.c
  86. +1 −1  lib/http_proxy.c
  87. +1 −1  lib/idn_win32.c
  88. +1 −1  lib/if2ip.c
  89. +1 −1  lib/if2ip.h
  90. +1 −1  lib/imap.c
  91. +1 −1  lib/inet_ntop.c
  92. +1 −1  lib/inet_ntop.h
  93. +1 −1  lib/inet_pton.c
  94. +1 −1  lib/inet_pton.h
  95. +1 −1  lib/krb4.c
  96. +1 −1  lib/krb5.c
  97. +1 −1  lib/ldap.c
  98. +1 −1  lib/llist.c
  99. +1 −1  lib/llist.h
  100. +1 −1  lib/md4.c
  101. +1 −1  lib/md5.c
  102. +1 −1  lib/memdebug.c
  103. +1 −1  lib/memdebug.h
  104. +1 −1  lib/mprintf.c
  105. +1 −1  lib/multi.c
  106. +1 −1  lib/netrc.c
  107. +1 −1  lib/non-ascii.c
  108. +1 −1  lib/non-ascii.h
  109. +1 −1  lib/nonblock.c
  110. +1 −1  lib/nss.c
  111. +1 −1  lib/nssg.h
  112. +1 −1  lib/nwlib.c
  113. +1 −1  lib/nwos.c
  114. +1 −1  lib/openldap.c
  115. +1 −1  lib/parsedate.c
  116. +1 −1  lib/pingpong.c
  117. +1 −1  lib/pingpong.h
  118. +1 −1  lib/polarssl.c
  119. +1 −1  lib/polarssl.h
  120. +1 −1  lib/pop3.c
  121. +1 −1  lib/progress.c
  122. +1 −1  lib/qssl.c
  123. +1 −1  lib/qssl.h
  124. +1 −1  lib/rawstr.c
  125. +1 −1  lib/rtsp.c
  126. +1 −1  lib/security.c
  127. +1 −1  lib/select.c
  128. +1 −1  lib/select.h
  129. +1 −1  lib/sendf.c
  130. +1 −1  lib/sendf.h
  131. +1 −1  lib/share.c
  132. +1 −1  lib/share.h
  133. +1 −1  lib/slist.c
  134. +1 −1  lib/smtp.c
  135. +1 −1  lib/sockaddr.h
  136. +1 −1  lib/socks.c
  137. +1 −1  lib/socks.h
  138. +1 −1  lib/socks_gssapi.c
  139. +1 −1  lib/socks_sspi.c
  140. +1 −1  lib/speedcheck.c
  141. +1 −1  lib/speedcheck.h
  142. +1 −1  lib/splay.c
  143. +1 −1  lib/splay.h
  144. +1 −1  lib/ssh.c
  145. +1 −1  lib/ssh.h
  146. +1 −1  lib/sslgen.c
  147. +1 −1  lib/sslgen.h
  148. +1 −1  lib/ssluse.c
  149. +1 −1  lib/ssluse.h
  150. +1 −1  lib/strdup.c
  151. +1 −1  lib/strdup.h
  152. +1 −1  lib/strequal.c
  153. +1 −1  lib/strerror.c
  154. +1 −1  lib/strtok.c
  155. +1 −1  lib/strtok.h
  156. +1 −1  lib/strtoofft.c
  157. +1 −1  lib/strtoofft.h
  158. +1 −1  lib/telnet.c
  159. +1 −1  lib/tftp.c
  160. +1 −1  lib/timeval.h
  161. +1 −1  lib/transfer.c
  162. +1 −1  lib/url.c
  163. +1 −1  lib/url.h
  164. +1 −1  lib/urldata.h
  165. +1 −1  lib/version.c
  166. +1 −1  lib/warnless.c
  167. +1 −1  lib/wildcard.c
  168. +3 −3 m4/curl-reentrant.m4
  169. +1 −1  packages/OS400/os400sys.c
  170. +2 −2 src/CMakeLists.txt
  171. +2 −2 src/Makefile.am
  172. +1 −1  src/tool_setup.h
  173. +1 −1  tests/libtest/CMakeLists.txt
  174. +2 −2 tests/libtest/Makefile.am
  175. +1 −1  tests/libtest/chkhostname.c
  176. +1 −1  tests/libtest/sethostname.c
  177. +2 −2 tests/libtest/test.h
  178. +1 −1  tests/libtest/testutil.c
  179. +1 −1  tests/libtest/testutil.h
  180. +2 −2 tests/server/CMakeLists.txt
  181. +2 −2 tests/server/Makefile.am
  182. +1 −1  tests/server/server_setup.h
  183. +2 −2 tests/unit/Makefile.am
View
2  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.
View
2  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 \
View
2  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.
*/
View
4 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
View
6 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
View
2  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.
View
2  lib/amigaos.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#if defined(__AMIGA__) && !defined(__ixemul__)
View
2  lib/amigaos.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#if defined(__AMIGA__) && !defined(__ixemul__)
View
2  lib/asyn-ares.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_LIMITS_H
#include <limits.h>
View
2  lib/asyn-thread.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
View
2  lib/asyn.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "curl_addrinfo.h"
struct addrinfo;
View
2  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>
View
2  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>
View
2  lib/bundles.c
@@ -21,7 +21,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include <curl/curl.h>
View
2  lib/conncache.c
@@ -21,7 +21,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include <curl/curl.h>
View
2  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 */
View
2  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"
View
2  lib/content_encoding.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_LIBZ
View
2  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)
View
2  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)
View
2  lib/cookie.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include <curl/curl.h>
View
2  lib/curl_addrinfo.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include <curl/curl.h>
View
2  lib/curl_addrinfo.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
View
2  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
View
2  lib/curl_darwinssl.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_DARWINSSL
View
2  lib/curl_fnmatch.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "curl_fnmatch.h"
View
2  lib/curl_gethostname.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "curl_gethostname.h"
View
2  lib/curl_gssapi.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_GSSAPI
View
2  lib/curl_gssapi.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "urldata.h"
#ifdef HAVE_GSSAPI
View
2  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 */
View
2  lib/curl_memrchr.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "curl_memrchr.h"
View
2  lib/curl_memrchr.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_MEMRCHR
View
2  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))
View
2  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))
View
2  lib/curl_ntlm.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_NTLM
View
2  lib/curl_ntlm.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_NTLM
View
2  lib/curl_ntlm_core.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)
View
2  lib/curl_ntlm_core.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)
View
2  lib/curl_ntlm_msgs.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_NTLM
View
2  lib/curl_ntlm_msgs.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_NTLM
View
2  lib/curl_ntlm_wb.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)
View
2  lib/curl_ntlm_wb.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)
View
2  lib/curl_rand.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include <curl/curl.h>
View
2  lib/curl_rtmp.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_LIBRTMP
View
2  lib/curl_sasl.c
@@ -25,7 +25,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include <curl/curl.h>
#include "urldata.h"
View
2  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
View
2  lib/curl_schannel.h
@@ -22,7 +22,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_SCHANNEL
View
4 lib/setup.h → 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
View
10 lib/setup_once.h → 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.
*/
View
2  lib/curl_sspi.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_WINDOWS_SSPI
View
2  lib/curl_sspi.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_WINDOWS_SSPI
View
2  lib/curl_threads.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#if defined(USE_THREADS_POSIX)
# ifdef HAVE_PTHREAD_H
View
2  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
View
2  lib/cyassl.c
@@ -26,7 +26,7 @@
*
*/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_CYASSL
View
2  lib/cyassl.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_CYASSL
View
2  lib/dict.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_DICT
View
2  lib/easy.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
View
2  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>
View
2  lib/file.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_FILE
View
2  lib/fileinfo.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "strdup.h"
#include "fileinfo.h"
View
2  lib/formdata.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include <curl/curl.h>
View
2  lib/ftp.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_FTP
View
2  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
View
2  lib/ftplistparser.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_FTP
View
2  lib/getenv.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef __VMS
#include <unixlib.h>
View
2  lib/getinfo.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include <curl/curl.h>
View
2  lib/gopher.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_GOPHER
View
5 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.
View
2  lib/gtls.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_GNUTLS
View
2  lib/hash.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "hash.h"
#include "llist.h"
View
2  lib/hash.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include <stddef.h>
View
2  lib/hmac.c
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_CRYPTO_AUTH
View
2  lib/hostasyn.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
View
2  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 */
View
4 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 */
View
2  lib/hostip.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "hash.h"
#include "curl_addrinfo.h"
#include "asyn.h"
View
2  lib/hostip4.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
View
2  lib/hostip6.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
View
2  lib/hostsyn.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
View
2  lib/http.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_HTTP
View
2  lib/http_chunks.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_HTTP
View
2  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)
View
2  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 */
View
2  lib/http_negotiate.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_GSSAPI
#ifdef HAVE_OLD_GSSMIT
View
2  lib/http_negotiate_sspi.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_WINDOWS_SSPI
View
2  lib/http_proxy.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
View
2  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
View
2  lib/if2ip.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
View
2  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);
View
2  lib/imap.c
@@ -28,7 +28,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_IMAP
View
2  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
View
2  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);
View
2  lib/inet_pton.c
@@ -16,7 +16,7 @@
* SOFTWARE.
*/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef HAVE_INET_PTON
View
2  lib/inet_pton.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
int Curl_inet_pton(int, const char *, void *);
View
2  lib/krb4.c
@@ -39,7 +39,7 @@
*
*/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_FTP
#ifdef HAVE_KRB4
View
2  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
View
2  lib/ldap.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#if !defined(CURL_DISABLE_LDAP) && !defined(USE_OPENLDAP)
View
2  lib/llist.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "llist.h"
#include "curl_memory.h"
View
2  lib/llist.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include <stddef.h>
typedef void (*curl_llist_dtor)(void *, void *);
View
2  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 */
View
2  lib/md5.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_CRYPTO_AUTH
View
2  lib/memdebug.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef CURLDEBUG
View
2  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>
View
2  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 */
View
2  lib/multi.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include <curl/curl.h>
View
2  lib/netrc.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_PWD_H
#include <pwd.h>
View
2  lib/non-ascii.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef CURL_DOES_CONVERSIONS
View
2  lib/non-ascii.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef CURL_DOES_CONVERSIONS
View
2  lib/nonblock.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
View
2  lib/nss.c
@@ -25,7 +25,7 @@
* but sslgen.c should ever call or use these functions.
*/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_NSS
View
2  lib/nssg.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_NSS
/*
View
2  lib/nwlib.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef NETWARE /* Novell NetWare */
View
2  lib/nwos.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef NETWARE /* Novell NetWare */
View
2  lib/openldap.c
@@ -21,7 +21,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#if !defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP)
View
2  lib/parsedate.c
@@ -73,7 +73,7 @@
*/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_LIMITS_H
#include <limits.h>
View
2  lib/pingpong.c
@@ -23,7 +23,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "urldata.h"
#include "sendf.h"
View
2  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)
View
2  lib/polarssl.c
@@ -27,7 +27,7 @@
*
*/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_POLARSSL
View
2  lib/polarssl.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_POLARSSL
View
2  lib/pop3.c
@@ -30,7 +30,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_POP3
View
2  lib/progress.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "urldata.h"
#include "sendf.h"
View
2  lib/qssl.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef USE_QSOSSL
View
2  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
View
2  lib/rawstr.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "rawstr.h"
View
2  lib/rtsp.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_RTSP
View
2  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)
View
2  lib/select.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
View
2  lib/select.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifdef HAVE_SYS_POLL_H
#include <sys/poll.h>
View
2  lib/sendf.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include <curl/curl.h>
View
2  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, ...);
View
2  lib/share.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include <curl/curl.h>
#include "urldata.h"
View
2  lib/share.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include <curl/curl.h>
#include "cookie.h"
#include "urldata.h"
View
2  lib/slist.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "curl_memory.h"
#include "slist.h"
View
2  lib/smtp.c
@@ -28,7 +28,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_SMTP
View
2  lib/sockaddr.h
@@ -22,7 +22,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
struct Curl_sockaddr_storage {
union {
View
2  lib/socks.c
@@ -20,7 +20,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#if !defined(CURL_DISABLE_PROXY)
View
2  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
View
2  lib/socks_gssapi.c
@@ -21,7 +21,7 @@
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#ifndef CURL_DISABLE_PROXY
View
2  lib/socks_sspi.c
@@ -21,7 +21,7 @@
*
***************************************************************************/
-#include "setup.h"