generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: fix circular header inclusion with other packages

Browse Source 
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.
This commit is contained in:
Yang Tse 2013-01-06 19:06:49 +01:00
parent e2bcd2ab9e
commit 5a053ffe80
183 changed files with 197 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/INSTALL
View File

@ -464,7 +464,7 @@ Win32
possibilities: possibilities:
- Modify lib/config-win32.h - Modify lib/config-win32.h
- Modify lib/setup.h - Modify lib/curl_setup.h
- Modify lib/Makefile.vc6 - Modify lib/Makefile.vc6
- Add defines to Project/Settings/C/C++/General/Preprocessor Definitions - Add defines to Project/Settings/C/C++/General/Preprocessor Definitions
in the vc6libcurl.dsw/vc6libcurl.dsp Visual C++ 6 IDE project. in the vc6libcurl.dsw/vc6libcurl.dsp Visual C++ 6 IDE project.

2
docs/examples/Makefile.am
View File

@ -31,7 +31,7 @@ EXTRA_DIST = README Makefile.example Makefile.inc Makefile.m32 \
# might possibly already be installed in the system. # might possibly already be installed in the system.
# #
# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h # $(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_srcdir)/include is for libcurl's external include files
AM_CPPFLAGS = -I$(top_builddir)/include/curl \ AM_CPPFLAGS = -I$(top_builddir)/include/curl \

2
include/curl/curlrules.h
View File

@ -190,7 +190,7 @@ typedef char
* CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow * 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, * these to be visible and exported by the external libcurl interface API,
* while also making them visible to the library internals, simply including * 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 * If some day this section would grow big enough, all this should be moved
* to its own header file. * to its own header file.
*/ */

4
lib/Makefile.am
View File

@ -57,10 +57,10 @@ CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@
# might possibly already be installed in the system. # might possibly already be installed in the system.
# #
# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h # $(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_srcdir)/include is for libcurl's external include files
# $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file # $(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_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 # $(top_srcdir)/ares is for in-tree c-ares's external include files

6
lib/Makefile.inc
View File

@ -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 \ 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 \ 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 \ 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 \ 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_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 \ 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 \ 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 \ 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_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 \ 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

2
lib/README.hostip
View File

@ -32,4 +32,4 @@
hostip6.c - ipv6-specific functions hostip6.c - ipv6-specific functions
The hostip.h is the single united header file for all this. It defines the 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.

2
lib/amigaos.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#if defined(__AMIGA__) && !defined(__ixemul__) #if defined(__AMIGA__) && !defined(__ixemul__)

2
lib/amigaos.h
View File

@ -21,7 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#if defined(__AMIGA__) && !defined(__ixemul__) #if defined(__AMIGA__) && !defined(__ixemul__)

2
lib/asyn-ares.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_LIMITS_H #ifdef HAVE_LIMITS_H
#include <limits.h> #include <limits.h>

2
lib/asyn-thread.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>

2
lib/asyn.h
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include "curl_addrinfo.h" #include "curl_addrinfo.h"
struct addrinfo; struct addrinfo;

2
lib/axtls.c
View File

@ -26,7 +26,7 @@
* but sslgen.c should ever call or use these functions. * but sslgen.c should ever call or use these functions.
*/ */
#include "setup.h" #include "curl_setup.h"
#ifdef USE_AXTLS #ifdef USE_AXTLS
#include <axTLS/ssl.h> #include <axTLS/ssl.h>

2
lib/base64.c
View File

@ -22,7 +22,7 @@
/* Base64 encoding/decoding */ /* Base64 encoding/decoding */
#include "setup.h" #include "curl_setup.h"
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h> #include <curl/mprintf.h>

2
lib/bundles.c
View File

@ -21,7 +21,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include <curl/curl.h> #include <curl/curl.h>

2
lib/conncache.c
View File

@ -21,7 +21,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include <curl/curl.h> #include <curl/curl.h>

2
lib/connect.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
#include <netinet/in.h> /* <netinet/tcp.h> may need it */ #include <netinet/in.h> /* <netinet/tcp.h> may need it */

2
lib/connect.h
View File

@ -21,7 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */ #include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */
#include "sockaddr.h" #include "sockaddr.h"

2
lib/content_encoding.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ

2
lib/content_encoding.h
View File

@ -21,7 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
/* /*
* Comma-separated list all supported Content-Encodings ('identity' is implied) * Comma-separated list all supported Content-Encodings ('identity' is implied)

2
lib/cookie.c
View File

@ -77,7 +77,7 @@ Example set of cookies:
****/ ****/
#include "setup.h" #include "curl_setup.h"
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)

2
lib/cookie.h
View File

@ -21,7 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include <curl/curl.h> #include <curl/curl.h>

2
lib/curl_addrinfo.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include <curl/curl.h> #include <curl/curl.h>

2
lib/curl_addrinfo.h
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
# include <netinet/in.h> # include <netinet/in.h>

2
lib/curl_darwinssl.c
View File

@ -26,7 +26,7 @@
* TLS/SSL layer. No code but sslgen.c should ever call or use these functions. * 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 #ifdef USE_DARWINSSL

2
lib/curl_darwinssl.h
View File

@ -21,7 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef USE_DARWINSSL #ifdef USE_DARWINSSL

2
lib/curl_fnmatch.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include "curl_fnmatch.h" #include "curl_fnmatch.h"

2
lib/curl_gethostname.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include "curl_gethostname.h" #include "curl_gethostname.h"

2
lib/curl_gssapi.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_GSSAPI #ifdef HAVE_GSSAPI

2
lib/curl_gssapi.h
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include "urldata.h" #include "urldata.h"
#ifdef HAVE_GSSAPI #ifdef HAVE_GSSAPI

2
lib/curl_md4.h
View File

@ -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 /* NSS crypto library does not provide the MD4 hash algorithm, so that we have
* a local implementation of it */ * a local implementation of it */

2
lib/curl_memrchr.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include "curl_memrchr.h" #include "curl_memrchr.h"

2
lib/curl_memrchr.h
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_MEMRCHR #ifdef HAVE_MEMRCHR

2
lib/curl_multibyte.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE)) #if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE))

2
lib/curl_multibyte.h
View File

@ -21,7 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE)) #if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE))

2
lib/curl_ntlm.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef USE_NTLM #ifdef USE_NTLM

2
lib/curl_ntlm.h
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef USE_NTLM #ifdef USE_NTLM

2
lib/curl_ntlm_core.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI) #if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)

2
lib/curl_ntlm_core.h
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI) #if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)

2
lib/curl_ntlm_msgs.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef USE_NTLM #ifdef USE_NTLM

2
lib/curl_ntlm_msgs.h
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef USE_NTLM #ifdef USE_NTLM

2
lib/curl_ntlm_wb.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#if defined(USE_NTLM) && defined(NTLM_WB_ENABLED) #if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)

2
lib/curl_ntlm_wb.h
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#if defined(USE_NTLM) && defined(NTLM_WB_ENABLED) #if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)

2
lib/curl_rand.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include <curl/curl.h> #include <curl/curl.h>

2
lib/curl_rtmp.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef USE_LIBRTMP #ifdef USE_LIBRTMP

2
lib/curl_sasl.c
View File

@ -25,7 +25,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include <curl/curl.h> #include <curl/curl.h>
#include "urldata.h" #include "urldata.h"

2
lib/curl_schannel.c
View File

@ -51,7 +51,7 @@
* http://msdn.microsoft.com/en-us/library/windows/desktop/aa380161.aspx * http://msdn.microsoft.com/en-us/library/windows/desktop/aa380161.aspx
*/ */
#include "setup.h" #include "curl_setup.h"
#ifdef USE_SCHANNEL #ifdef USE_SCHANNEL

2
lib/curl_schannel.h
View File

@ -22,7 +22,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef USE_SCHANNEL #ifdef USE_SCHANNEL

4
lib/setup.h → lib/curl_setup.h
View File

@ -645,9 +645,7 @@ int netware_init(void);
* Include macros and defines that should only be processed once. * Include macros and defines that should only be processed once.
*/ */
#ifndef __SETUP_ONCE_H #include "curl_setup_once.h"
#include "setup_once.h"
#endif
/* /*
* Definition of our NOP statement Object-like macro * Definition of our NOP statement Object-like macro

10
lib/setup_once.h → lib/curl_setup_once.h
View File

@ -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. * Inclusion of common header files.
*/ */

2
lib/curl_sspi.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef USE_WINDOWS_SSPI #ifdef USE_WINDOWS_SSPI

2
lib/curl_sspi.h
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef USE_WINDOWS_SSPI #ifdef USE_WINDOWS_SSPI

2
lib/curl_threads.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#if defined(USE_THREADS_POSIX) #if defined(USE_THREADS_POSIX)
# ifdef HAVE_PTHREAD_H # ifdef HAVE_PTHREAD_H

2
lib/curl_threads.h
View File

@ -21,7 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#if defined(USE_THREADS_POSIX) #if defined(USE_THREADS_POSIX)
# define CURL_STDCALL # define CURL_STDCALL

2
lib/cyassl.c
View File

@ -26,7 +26,7 @@
* *
*/ */
#include "setup.h" #include "curl_setup.h"
#ifdef USE_CYASSL #ifdef USE_CYASSL

2
lib/cyassl.h
View File

@ -21,7 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef USE_CYASSL #ifdef USE_CYASSL

2
lib/dict.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifndef CURL_DISABLE_DICT #ifndef CURL_DISABLE_DICT

2
lib/easy.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>

2
lib/escape.c
View File

@ -23,7 +23,7 @@
/* Escape and unescape URL encoding in strings. The functions return a new /* Escape and unescape URL encoding in strings. The functions return a new
* allocated string or NULL if an error occurred. */ * allocated string or NULL if an error occurred. */
#include "setup.h" #include "curl_setup.h"
#include <curl/curl.h> #include <curl/curl.h>

2
lib/file.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifndef CURL_DISABLE_FILE #ifndef CURL_DISABLE_FILE

2
lib/fileinfo.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include "strdup.h" #include "strdup.h"
#include "fileinfo.h" #include "fileinfo.h"

2
lib/formdata.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include <curl/curl.h> #include <curl/curl.h>

2
lib/ftp.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifndef CURL_DISABLE_FTP #ifndef CURL_DISABLE_FTP

2
lib/ftplistparser.c
View File

@ -35,7 +35,7 @@
* 01-29-97 11:32PM <DIR> prog * 01-29-97 11:32PM <DIR> prog
*/ */
#include "setup.h" #include "curl_setup.h"
#ifndef CURL_DISABLE_FTP #ifndef CURL_DISABLE_FTP

2
lib/ftplistparser.h
View File

@ -21,7 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifndef CURL_DISABLE_FTP #ifndef CURL_DISABLE_FTP

2
lib/getenv.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef __VMS #ifdef __VMS
#include <unixlib.h> #include <unixlib.h>

2
lib/getinfo.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include <curl/curl.h> #include <curl/curl.h>

2
lib/gopher.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifndef CURL_DISABLE_GOPHER #ifndef CURL_DISABLE_GOPHER

5
lib/gtls.c
View File

@ -28,7 +28,7 @@
* since they were not present in 1.0.X. * since they were not present in 1.0.X.
*/ */
#include "setup.h" #include "curl_setup.h"
#ifdef USE_GNUTLS #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 * 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() * 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 * 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 * us to get specific about the fourth "flags" argument, and to use arbitrary
* private data with gnutls_transport_set_ptr if we wish. * private data with gnutls_transport_set_ptr if we wish.

2
lib/gtls.h
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef USE_GNUTLS #ifdef USE_GNUTLS

2
lib/hash.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include "hash.h" #include "hash.h"
#include "llist.h" #include "llist.h"

2
lib/hash.h
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include <stddef.h> #include <stddef.h>

2
lib/hmac.c
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifndef CURL_DISABLE_CRYPTO_AUTH #ifndef CURL_DISABLE_CRYPTO_AUTH

2
lib/hostasyn.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>

2
lib/hostcheck.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#if defined(USE_SSLEAY) || defined(USE_AXTLS) #if defined(USE_SSLEAY) || defined(USE_AXTLS)
/* these two backends use functions from this file */ /* these two backends use functions from this file */

4
lib/hostip.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>
@ -106,7 +106,7 @@
* asyn-thread.c - functions for threaded name resolves * asyn-thread.c - functions for threaded name resolves
* The hostip.h is the united header file for all this. It defines the * 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 */ /* These two symbols are for the global DNS cache */

2
lib/hostip.h
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include "hash.h" #include "hash.h"
#include "curl_addrinfo.h" #include "curl_addrinfo.h"
#include "asyn.h" #include "asyn.h"

2
lib/hostip4.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>

2
lib/hostip6.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>

2
lib/hostsyn.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>

2
lib/http.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifndef CURL_DISABLE_HTTP #ifndef CURL_DISABLE_HTTP

2
lib/http_chunks.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifndef CURL_DISABLE_HTTP #ifndef CURL_DISABLE_HTTP

2
lib/http_digest.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH) #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH)

2
lib/http_digest.h
View File

@ -21,7 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
typedef enum { typedef enum {
CURLDIGEST_NONE, /* not a digest */ CURLDIGEST_NONE, /* not a digest */

2
lib/http_negotiate.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_GSSAPI #ifdef HAVE_GSSAPI
#ifdef HAVE_OLD_GSSMIT #ifdef HAVE_OLD_GSSMIT

2
lib/http_negotiate_sspi.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef USE_WINDOWS_SSPI #ifdef USE_WINDOWS_SSPI

2
lib/http_proxy.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP) #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)

2
lib/idn_win32.c
View File

@ -24,7 +24,7 @@
* IDN conversions using Windows kernel32 and normaliz libraries. * IDN conversions using Windows kernel32 and normaliz libraries.
*/ */
#include "setup.h" #include "curl_setup.h"
#ifdef USE_WIN32_IDN #ifdef USE_WIN32_IDN

2
lib/if2ip.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
# include <netinet/in.h> # include <netinet/in.h>

2
lib/if2ip.h
View File

@ -21,7 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
bool Curl_if_is_interface_name(const char *interf); bool Curl_if_is_interface_name(const char *interf);
char *Curl_if2ip(int af, const char *interf, char *buf, int buf_size); char *Curl_if2ip(int af, const char *interf, char *buf, int buf_size);

2
lib/imap.c
View File

@ -28,7 +28,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#ifndef CURL_DISABLE_IMAP #ifndef CURL_DISABLE_IMAP

2
lib/inet_ntop.c
View File

@ -18,7 +18,7 @@
* Original code by Paul Vixie. "curlified" by Gisle Vanem. * Original code by Paul Vixie. "curlified" by Gisle Vanem.
*/ */
#include "setup.h" #include "curl_setup.h"
#ifndef HAVE_INET_NTOP #ifndef HAVE_INET_NTOP

2
lib/inet_ntop.h
View File

@ -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); char *Curl_inet_ntop(int af, const void *addr, char *buf, size_t size);

2
lib/inet_pton.c
View File

@ -16,7 +16,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
#include "setup.h" #include "curl_setup.h"
#ifndef HAVE_INET_PTON #ifndef HAVE_INET_PTON

2
lib/inet_pton.h
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
int Curl_inet_pton(int, const char *, void *); int Curl_inet_pton(int, const char *, void *);

2
lib/krb4.c
View File

@ -39,7 +39,7 @@
* *
*/ */
#include "setup.h" #include "curl_setup.h"
#ifndef CURL_DISABLE_FTP #ifndef CURL_DISABLE_FTP
#ifdef HAVE_KRB4 #ifdef HAVE_KRB4

2
lib/krb5.c
View File

@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. */ * SUCH DAMAGE. */
#include "setup.h" #include "curl_setup.h"
#ifndef CURL_DISABLE_FTP #ifndef CURL_DISABLE_FTP
#ifdef HAVE_GSSAPI #ifdef HAVE_GSSAPI

2
lib/ldap.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#if !defined(CURL_DISABLE_LDAP) && !defined(USE_OPENLDAP) #if !defined(CURL_DISABLE_LDAP) && !defined(USE_OPENLDAP)

2
lib/llist.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include "llist.h" #include "llist.h"
#include "curl_memory.h" #include "curl_memory.h"

2
lib/llist.h
View File

@ -22,7 +22,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h" #include "curl_setup.h"
#include <stddef.h> #include <stddef.h>
typedef void (*curl_llist_dtor)(void *, void *); typedef void (*curl_llist_dtor)(void *, void *);

2
lib/md4.c
View File

@ -20,7 +20,7 @@
documentation and/or software. 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 /* NSS crypto library does not provide the MD4 hash algorithm, so that we have
* a local implementation of it */ * a local implementation of it */

Some files were not shown because too many files have changed in this diff Show More