diff options
| author | Yang Tse <yangsita@gmail.com> | 2012-12-28 12:40:20 +0100 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2012-12-28 19:37:11 +0100 |
| commit | f871de0064ee4bd3aee07c5b018f7a6438ec8910 (patch) | |
| tree | 8a54d3693c887fe19cf895f1a86775f3f7e4bb70 | |
| parent | ec691ca34bbba56e365c6c923887cae338093f8a (diff) | |
| download | curl-f871de0064ee4bd3aee07c5b018f7a6438ec8910.tar.gz | |
build: make use of 76 lib/*.h renamed files
76 private header files renamed to use our standard naming scheme.
This change affects 322 files in libcurl's source tree.
322 files changed, 1354 insertions, 1279 deletions
@@ -81,7 +81,7 @@ removethis(){ # if test ! -f configure.ac || test ! -f src/tool_main.c || - test ! -f lib/urldata.h || + test ! -f lib/curl_urldata.h || test ! -f include/curl/curl.h || test ! -f m4/curl-functions.m4; then echo "Can not run buildconf from outside of curl's source subdirectory!" diff --git a/configure.ac b/configure.ac index ff48c5bc4..5853e5766 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,7 @@ AC_COPYRIGHT([Copyright (c) 1998 - 2012 Daniel Stenberg, <daniel@haxx.se> This configure script may be copied, distributed and modified under the terms of the curl license; see COPYING for more details]) -AC_CONFIG_SRCDIR([lib/urldata.h]) +AC_CONFIG_SRCDIR([lib/curl_urldata.h]) AM_CONFIG_HEADER(lib/curl_config.h include/curl/curlbuild.h) AC_CONFIG_MACRO_DIR([m4]) AM_MAINTAINER_MODE diff --git a/docs/INSTALL b/docs/INSTALL index eac3cd555..bb620466c 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -467,7 +467,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/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.inc b/lib/Makefile.inc index f97ef6d0e..115dd4487 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -27,20 +27,104 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ curl_multibyte.c curl_darwinssl.c hostcheck.c \ bundles.c conncache.c -HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \ - progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h \ - if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h \ - getinfo.h strequal.h krb4.h memdebug.h http_chunks.h curl_rand.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 \ - 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 \ - 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 +HHEADERS = \ + curl_addrinfo.h \ + curl_amigaos.h \ + curl_arpa_telnet.h \ + curl_asyn.h \ + curl_axtls.h \ + curl_base64.h \ + curl_bundles.h \ + curl_conncache.h \ + curl_connect.h \ + curl_content_encoding.h \ + curl_cookie.h \ + curl_cyassl.h \ + curl_darwinssl.h \ + curl_dict.h \ + curl_easyif.h \ + curl_escape.h \ + curl_file.h \ + curl_fileinfo.h \ + curl_fnmatch.h \ + curl_formdata.h \ + curl_ftp.h \ + curl_ftplistparser.h \ + curl_gethostname.h \ + curl_getinfo.h \ + curl_gopher.h \ + curl_gssapi.h \ + curl_gtls.h \ + curl_hash.h \ + curl_hmac.h \ + curl_hostcheck.h \ + curl_hostip.h \ + curl_http.h \ + curl_http_chunks.h \ + curl_http_digest.h \ + curl_http_negotiate.h \ + curl_http_proxy.h \ + curl_if2ip.h \ + curl_imap.h \ + curl_inet_ntop.h \ + curl_inet_pton.h \ + curl_krb4.h \ + curl_ldap.h \ + curl_llist.h \ + curl_md4.h \ + curl_md5.h \ + curl_memdebug.h \ + curl_memory.h \ + curl_memrchr.h \ + curl_multibyte.h \ + curl_multiif.h \ + curl_netrc.h \ + curl_non-ascii.h \ + curl_nonblock.h \ + curl_nssg.h \ + curl_ntlm.h \ + curl_ntlm_core.h \ + curl_ntlm_msgs.h \ + curl_ntlm_wb.h \ + curl_parsedate.h \ + curl_pingpong.h \ + curl_polarssl.h \ + curl_pop3.h \ + curl_progress.h \ + curl_qssl.h \ + curl_rand.h \ + curl_rawstr.h \ + curl_rtmp.h \ + curl_rtsp.h \ + curl_sasl.h \ + curl_schannel.h \ + curl_select.h \ + curl_sendf.h \ + curl_setup.h \ + curl_setup_once.h \ + curl_share.h \ + curl_slist.h \ + curl_smtp.h \ + curl_sockaddr.h \ + curl_socks.h \ + curl_speedcheck.h \ + curl_splay.h \ + curl_ssh.h \ + curl_sslgen.h \ + curl_ssluse.h \ + curl_sspi.h \ + curl_strdup.h \ + curl_strequal.h \ + curl_strerror.h \ + curl_strtok.h \ + curl_strtoofft.h \ + curl_telnet.h \ + curl_tftp.h \ + curl_threads.h \ + curl_timeval.h \ + curl_transfer.h \ + curl_url.h \ + curl_urldata.h \ + curl_wildcard.h \ + curlx.h + diff --git a/lib/README.hostip b/lib/README.hostip index 9723b93fd..a87dab45a 100644 --- a/lib/README.hostip +++ b/lib/README.hostip @@ -31,5 +31,5 @@ hostip4.c - ipv4-specific functions 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. + The curl_hostip.h is the single united header file for all this. It defines + the CURLRES_* defines based on the config*.h and curl_setup.h defines. diff --git a/lib/amigaos.c b/lib/amigaos.c index 71ea704e1..c726abb68 100644 --- a/lib/amigaos.c +++ b/lib/amigaos.c @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #if defined(__AMIGA__) && !defined(__ixemul__) #include <amitcp/socketbasetags.h> -#include "amigaos.h" +#include "curl_amigaos.h" struct Library *SocketBase = NULL; extern int errno, h_errno; 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..6e09e9b98 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> @@ -51,23 +51,23 @@ /*********************************************************************** * Only for ares-enabled builds * And only for functions that fulfill the asynch resolver backend API - * as defined in asyn.h, nothing else belongs in this file! + * as defined in curl_asyn.h, nothing else belongs in this file! **********************************************************************/ #ifdef CURLRES_ARES -#include "urldata.h" -#include "sendf.h" -#include "hostip.h" -#include "hash.h" -#include "share.h" -#include "strerror.h" -#include "url.h" -#include "multiif.h" -#include "inet_pton.h" -#include "connect.h" -#include "select.h" -#include "progress.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_hostip.h" +#include "curl_hash.h" +#include "curl_share.h" +#include "curl_strerror.h" +#include "curl_url.h" +#include "curl_multiif.h" +#include "curl_inet_pton.h" +#include "curl_connect.h" +#include "curl_select.h" +#include "curl_progress.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -87,7 +87,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" struct ResolverResults { int num_pending; /* number of ares_gethostbyname() requests */ diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c index 0d29d5887..6d3667fab 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> @@ -57,16 +57,16 @@ # define RESOLVER_ENOMEM ENOMEM #endif -#include "urldata.h" -#include "sendf.h" -#include "hostip.h" -#include "hash.h" -#include "share.h" -#include "strerror.h" -#include "url.h" -#include "multiif.h" -#include "inet_pton.h" -#include "inet_ntop.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_hostip.h" +#include "curl_hash.h" +#include "curl_share.h" +#include "curl_strerror.h" +#include "curl_url.h" +#include "curl_multiif.h" +#include "curl_inet_pton.h" +#include "curl_inet_ntop.h" #include "curl_threads.h" #define _MPRINTF_REPLACE /* use our functions only */ @@ -74,7 +74,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /*********************************************************************** * Only for threaded name resolves builds 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..3a29cc200 100644 --- a/lib/axtls.c +++ b/lib/axtls.c @@ -26,24 +26,24 @@ * but sslgen.c should ever call or use these functions. */ -#include "setup.h" +#include "curl_setup.h" #ifdef USE_AXTLS #include <axTLS/ssl.h> -#include "axtls.h" - -#include "sendf.h" -#include "inet_pton.h" -#include "sslgen.h" -#include "parsedate.h" -#include "connect.h" /* for the connect timeout */ -#include "select.h" +#include "curl_axtls.h" + +#include "curl_sendf.h" +#include "curl_inet_pton.h" +#include "curl_sslgen.h" +#include "curl_parsedate.h" +#include "curl_connect.h" /* for the connect timeout */ +#include "curl_select.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" -#include "hostcheck.h" +#include "curl_memdebug.h" +#include "curl_hostcheck.h" /* SSL_read is opied from axTLS compat layer */ @@ -65,14 +65,14 @@ static int SSL_read(SSL *ssl, void *buf, int num) int Curl_axtls_init(void) { /* axTLS has no global init. Everything is done through SSL and SSL_CTX - * structs stored in connectdata structure. Perhaps can move to axtls.h. + * structs stored in connectdata structure. Perhaps can move to curl_axtls.h. */ return 1; } int Curl_axtls_cleanup(void) { - /* axTLS has no global cleanup. Perhaps can move this to axtls.h. */ + /* axTLS has no global cleanup. Perhaps can move this to curl_axtls.h. */ return 1; } diff --git a/lib/axtls.h b/lib/axtls.h index 8d33b1c7a..06f78ed32 100644 --- a/lib/axtls.h +++ b/lib/axtls.h @@ -25,7 +25,7 @@ #ifdef USE_AXTLS #include "curl/curl.h" -#include "urldata.h" +#include "curl_urldata.h" int Curl_axtls_init(void); int Curl_axtls_cleanup(void); diff --git a/lib/base64.c b/lib/base64.c index ec46c09ab..3b90ee17a 100644 --- a/lib/base64.c +++ b/lib/base64.c @@ -22,19 +22,19 @@ /* Base64 encoding/decoding */ -#include "setup.h" +#include "curl_setup.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "urldata.h" /* for the SessionHandle definition */ -#include "warnless.h" +#include "curl_urldata.h" /* for the SessionHandle definition */ +#include "curl_warnless.h" #include "curl_base64.h" #include "curl_memory.h" -#include "non-ascii.h" +#include "curl_non-ascii.h" -/* include memdebug.h last */ -#include "memdebug.h" +/* include curl_memdebug.h last */ +#include "curl_memdebug.h" /* ---- Base64 Encoding/Decoding Table --- */ static const char table64[]= diff --git a/lib/bundles.c b/lib/bundles.c index f09ee2a35..efbaeee4f 100644 --- a/lib/bundles.c +++ b/lib/bundles.c @@ -21,21 +21,21 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include <curl/curl.h> -#include "urldata.h" -#include "url.h" -#include "progress.h" -#include "multiif.h" -#include "bundles.h" -#include "sendf.h" -#include "rawstr.h" +#include "curl_urldata.h" +#include "curl_url.h" +#include "curl_progress.h" +#include "curl_multiif.h" +#include "curl_bundles.h" +#include "curl_sendf.h" +#include "curl_rawstr.h" #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" static void conn_llist_dtor(void *user, void *element) { diff --git a/lib/conncache.c b/lib/conncache.c index a3a90f879..bc95e07df 100644 --- a/lib/conncache.c +++ b/lib/conncache.c @@ -21,22 +21,22 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include <curl/curl.h> -#include "urldata.h" -#include "url.h" -#include "progress.h" -#include "multiif.h" -#include "sendf.h" -#include "rawstr.h" -#include "bundles.h" -#include "conncache.h" +#include "curl_urldata.h" +#include "curl_url.h" +#include "curl_progress.h" +#include "curl_multiif.h" +#include "curl_sendf.h" +#include "curl_rawstr.h" +#include "curl_bundles.h" +#include "curl_conncache.h" #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #define CONNECTION_HASH_SIZE 97 diff --git a/lib/connect.c b/lib/connect.c index 19f5b2f5b..85226d808 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 */ @@ -59,24 +59,24 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "urldata.h" -#include "sendf.h" -#include "if2ip.h" -#include "strerror.h" -#include "connect.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_if2ip.h" +#include "curl_strerror.h" +#include "curl_connect.h" #include "curl_memory.h" -#include "select.h" -#include "url.h" /* for Curl_safefree() */ -#include "multiif.h" -#include "sockaddr.h" /* required for Curl_sockaddr_storage */ -#include "inet_ntop.h" -#include "inet_pton.h" -#include "sslgen.h" /* for Curl_ssl_check_cxn() */ -#include "progress.h" -#include "warnless.h" +#include "curl_select.h" +#include "curl_url.h" +#include "curl_multiif.h" +#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */ +#include "curl_inet_ntop.h" +#include "curl_inet_pton.h" +#include "curl_sslgen.h" /* for Curl_ssl_check_cxn() */ +#include "curl_progress.h" +#include "curl_warnless.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifdef __SYMBIAN32__ /* This isn't actually supported under Symbian OS */ diff --git a/lib/connect.h b/lib/connect.h index f84361f2e..db23b9281 100644 --- a/lib/connect.h +++ b/lib/connect.h @@ -21,10 +21,10 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" -#include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */ -#include "sockaddr.h" +#include "curl_nonblock.h" +#include "curl_sockaddr.h" CURLcode Curl_is_connected(struct connectdata *conn, int sockindex, diff --git a/lib/content_encoding.c b/lib/content_encoding.c index 3276ef988..6f4d1428a 100644 --- a/lib/content_encoding.c +++ b/lib/content_encoding.c @@ -20,17 +20,17 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef HAVE_LIBZ -#include "urldata.h" +#include "curl_urldata.h" #include <curl/curl.h> -#include "sendf.h" -#include "content_encoding.h" +#include "curl_sendf.h" +#include "curl_content_encoding.h" #include "curl_memory.h" -#include "memdebug.h" +#include "curl_memdebug.h" /* Comment this out if zlib is always going to be at least ver. 1.2.0.4 (doing so will reduce code size slightly). */ 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..90ee884bb 100644 --- a/lib/cookie.c +++ b/lib/cookie.c @@ -77,26 +77,26 @@ Example set of cookies: ****/ -#include "setup.h" +#include "curl_setup.h" #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) #define _MPRINTF_REPLACE #include <curl/mprintf.h> -#include "urldata.h" -#include "cookie.h" -#include "strequal.h" -#include "strtok.h" -#include "sendf.h" +#include "curl_urldata.h" +#include "curl_cookie.h" +#include "curl_strequal.h" +#include "curl_strtok.h" +#include "curl_sendf.h" #include "curl_memory.h" -#include "share.h" -#include "strtoofft.h" -#include "rawstr.h" +#include "curl_share.h" +#include "curl_strtoofft.h" +#include "curl_rawstr.h" #include "curl_memrchr.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" static void freecookie(struct Cookie *co) { 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..6cf7076f6 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> @@ -45,15 +45,15 @@ #endif #include "curl_addrinfo.h" -#include "inet_pton.h" -#include "warnless.h" +#include "curl_inet_pton.h" +#include "curl_warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.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..04067d167 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 @@ -42,12 +42,12 @@ #include <sys/sysctl.h> #endif -#include "urldata.h" -#include "sendf.h" -#include "inet_pton.h" -#include "connect.h" -#include "select.h" -#include "sslgen.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_inet_pton.h" +#include "curl_connect.h" +#include "curl_select.h" +#include "curl_sslgen.h" #include "curl_darwinssl.h" #define _MPRINTF_REPLACE /* use our functions only */ @@ -55,7 +55,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* From MacTypes.h (which we can't include because it isn't present in iOS: */ #define ioErr -36 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..b6f7dd948 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" @@ -29,7 +29,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #define CURLFNM_CHARSET_LEN (sizeof(char) * 256) #define CURLFNM_CHSET_SIZE (CURLFNM_CHARSET_LEN + 15) 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..2d2492ecb 100644 --- a/lib/curl_gssapi.c +++ b/lib/curl_gssapi.c @@ -20,12 +20,12 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef HAVE_GSSAPI #include "curl_gssapi.h" -#include "sendf.h" +#include "curl_sendf.h" OM_uint32 Curl_gss_init_sec_context( struct SessionHandle *data, diff --git a/lib/curl_gssapi.h b/lib/curl_gssapi.h index fd4596b80..df4bcd650 100644 --- a/lib/curl_gssapi.h +++ b/lib/curl_gssapi.h @@ -22,8 +22,8 @@ * ***************************************************************************/ -#include "setup.h" -#include "urldata.h" +#include "curl_setup.h" +#include "curl_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..ad7f1880d 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" @@ -29,7 +29,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifndef HAVE_MEMRCHR 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..75d6544b0 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)) @@ -35,7 +35,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" wchar_t *Curl_convert_UTF8_to_wchar(const char *str_utf8) { 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..470b9c62a 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 @@ -33,26 +33,26 @@ #define DEBUG_ME 0 -#include "urldata.h" -#include "sendf.h" -#include "rawstr.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_rawstr.h" #include "curl_ntlm.h" #include "curl_ntlm_msgs.h" #include "curl_ntlm_wb.h" -#include "url.h" +#include "curl_url.h" #include "curl_memory.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #if defined(USE_NSS) -#include "nssg.h" +#include "curl_nssg.h" #elif defined(USE_WINDOWS_SSPI) #include "curl_sspi.h" #endif /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #if DEBUG_ME # define DEBUG_OUT(x) x 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..ebd6e304b 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) @@ -91,9 +91,9 @@ # error "Can't compile NTLM support without a crypto library." #endif -#include "urldata.h" -#include "non-ascii.h" -#include "rawstr.h" +#include "curl_urldata.h" +#include "curl_non-ascii.h" +#include "curl_rawstr.h" #include "curl_memory.h" #include "curl_ntlm_core.h" @@ -101,7 +101,7 @@ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifdef USE_SSLEAY /* 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..e625a06c4 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 @@ -33,21 +33,21 @@ #define DEBUG_ME 0 -#include "urldata.h" -#include "non-ascii.h" -#include "sendf.h" +#include "curl_urldata.h" +#include "curl_non-ascii.h" +#include "curl_sendf.h" #include "curl_base64.h" #include "curl_ntlm_core.h" #include "curl_gethostname.h" #include "curl_multibyte.h" -#include "warnless.h" +#include "curl_warnless.h" #include "curl_memory.h" #ifdef USE_WINDOWS_SSPI # include "curl_sspi.h" #endif -#include "sslgen.h" +#include "curl_sslgen.h" #define BUILDING_CURL_NTLM_MSGS_C #include "curl_ntlm_msgs.h" @@ -56,7 +56,7 @@ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* "NTLMSSP" signature is always in ASCII regardless of the platform */ #define NTLMSSP_SIGNATURE "\x4e\x54\x4c\x4d\x53\x53\x50" 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..87ac6f48e 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) @@ -40,19 +40,19 @@ #include <signal.h> #endif -#include "urldata.h" -#include "sendf.h" -#include "select.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_select.h" #include "curl_ntlm_wb.h" -#include "url.h" -#include "strerror.h" +#include "curl_url.h" +#include "curl_strerror.h" #include "curl_memory.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #if DEBUG_ME # define DEBUG_OUT(x) x 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..bfd5f1d53 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> @@ -31,7 +31,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* Private pseudo-random number seed. Unsigned integer >= 32bit. Threads mutual exclusion is not implemented to acess it since we do not require diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c index b87bdf2c7..b8caca0a0 100644 --- a/lib/curl_rtmp.c +++ b/lib/curl_rtmp.c @@ -20,15 +20,15 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef USE_LIBRTMP -#include "urldata.h" -#include "nonblock.h" /* for curlx_nonblock */ -#include "progress.h" /* for Curl_pgrsSetUploadSize */ -#include "transfer.h" -#include "warnless.h" +#include "curl_urldata.h" +#include "curl_nonblock.h" /* for curlx_nonblock */ +#include "curl_progress.h" /* for Curl_pgrsSetUploadSize */ +#include "curl_transfer.h" +#include "curl_warnless.h" #include <curl/curl.h> #include <librtmp/rtmp.h> @@ -37,7 +37,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifdef _WIN32 #define setsockopt(a,b,c,d,e) (setsockopt)(a,b,c,(const char *)d,(int)e) diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c index ccb54a89f..1becc28df 100644 --- a/lib/curl_sasl.c +++ b/lib/curl_sasl.c @@ -24,10 +24,10 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include <curl/curl.h> -#include "urldata.h" +#include "curl_urldata.h" #include "curl_base64.h" #include "curl_md5.h" @@ -35,14 +35,14 @@ #include "curl_hmac.h" #include "curl_ntlm_msgs.h" #include "curl_sasl.h" -#include "warnless.h" +#include "curl_warnless.h" #include "curl_memory.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifndef CURL_DISABLE_CRYPTO_AUTH /* Retrieves the value for a corresponding key from the challenge string diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h index 469c9a1e4..fa8ac84ac 100644 --- a/lib/curl_sasl.h +++ b/lib/curl_sasl.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "pingpong.h" +#include "curl_pingpong.h" /* Authentication mechanism flags */ #define SASL_MECH_LOGIN 0x0001 diff --git a/lib/curl_schannel.c b/lib/curl_schannel.c index 8cb3af80f..3bbebec8a 100644 --- a/lib/curl_schannel.c +++ b/lib/curl_schannel.c @@ -29,16 +29,6 @@ */ /* - * Based upon the PolarSSL implementation in polarssl.c and polarssl.h: - * Copyright (C) 2010, 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com> - * - * Based upon the CyaSSL implementation in cyassl.c and cyassl.h: - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. - * - * Thanks for code and inspiration! - */ - -/* * TODO list for TLS/SSL implementation: * - implement client certificate authentication * - implement custom server certificate validation @@ -51,7 +41,7 @@ * http://msdn.microsoft.com/en-us/library/windows/desktop/aa380161.aspx */ -#include "setup.h" +#include "curl_setup.h" #ifdef USE_SCHANNEL @@ -61,21 +51,21 @@ #include "curl_sspi.h" #include "curl_schannel.h" -#include "sslgen.h" -#include "sendf.h" -#include "connect.h" /* for the connect timeout */ -#include "strerror.h" -#include "select.h" /* for the socket readyness */ -#include "inet_pton.h" /* for IP addr SNI check */ +#include "curl_sslgen.h" +#include "curl_sendf.h" +#include "curl_connect.h" /* for the connect timeout */ +#include "curl_strerror.h" +#include "curl_select.h" /* for the socket readyness */ +#include "curl_inet_pton.h" /* for IP addr SNI check */ #include "curl_multibyte.h" -#include "warnless.h" +#include "curl_warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* Uncomment to force verbose output * #define infof(x, y, ...) printf(y, __VA_ARGS__) diff --git a/lib/curl_schannel.h b/lib/curl_schannel.h index 37126ac7d..918670fe0 100644 --- a/lib/curl_schannel.h +++ b/lib/curl_schannel.h @@ -22,11 +22,11 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef USE_SCHANNEL -#include "urldata.h" +#include "curl_urldata.h" #ifndef UNISP_NAME_A #define UNISP_NAME_A "Microsoft Unified Security Protocol Provider" diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c index c3c41ec2f..40a0af1e4 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 @@ -33,7 +33,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* We use our own typedef here since some headers might lack these */ typedef PSecurityFunctionTable (APIENTRY *INITSECURITYINTERFACE_FN)(VOID); 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..8bbf0af98 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 @@ -39,7 +39,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #if defined(USE_THREADS_POSIX) 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/curlx.h b/lib/curlx.h index 9dc90a004..42c62958d 100644 --- a/lib/curlx.h +++ b/lib/curlx.h @@ -34,29 +34,29 @@ functions while they still are offered publicly. They will be made library- private one day */ -#include "strequal.h" -/* "strequal.h" provides the strequal protos */ +#include "curl_strequal.h" +/* "curl_strequal.h" provides the strequal protos */ -#include "strtoofft.h" -/* "strtoofft.h" provides this function: curlx_strtoofft(), returns a +#include "curl_strtoofft.h" +/* "curl_strtoofft.h" provides this function: curlx_strtoofft(), returns a curl_off_t number from a given string. */ -#include "timeval.h" +#include "curl_timeval.h" /* - "timeval.h" sets up a 'struct timeval' even for platforms that otherwise - don't have one and has protos for these functions: + "curl_timeval.h" sets up a 'struct timeval' even for platforms that + otherwise don't have one and has protos for these functions: curlx_tvnow() curlx_tvdiff() curlx_tvdiff_secs() */ -#include "nonblock.h" -/* "nonblock.h" provides curlx_nonblock() */ +#include "curl_nonblock.h" +/* "curl_nonblock.h" provides curlx_nonblock() */ -#include "warnless.h" -/* "warnless.h" provides functions: +#include "curl_warnless.h" +/* "curl_warnless.h" provides functions: curlx_ultous() curlx_ultouc() diff --git a/lib/cyassl.c b/lib/cyassl.c index 13c0d135d..a2f941ed1 100644 --- a/lib/cyassl.c +++ b/lib/cyassl.c @@ -26,7 +26,7 @@ * */ -#include "setup.h" +#include "curl_setup.h" #ifdef USE_CYASSL @@ -34,21 +34,21 @@ #include <limits.h> #endif -#include "urldata.h" -#include "sendf.h" -#include "inet_pton.h" -#include "cyassl.h" -#include "sslgen.h" -#include "parsedate.h" -#include "connect.h" /* for the connect timeout */ -#include "select.h" -#include "rawstr.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_inet_pton.h" +#include "curl_cyassl.h" +#include "curl_sslgen.h" +#include "curl_parsedate.h" +#include "curl_connect.h" /* for the connect timeout */ +#include "curl_select.h" +#include "curl_rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #include <cyassl/ssl.h> #include <cyassl/error.h> 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..114ef7c72 100644 --- a/lib/dict.c +++ b/lib/dict.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_DICT @@ -48,22 +48,22 @@ #include <sys/select.h> #endif -#include "urldata.h" +#include "curl_urldata.h" #include <curl/curl.h> -#include "transfer.h" -#include "sendf.h" +#include "curl_transfer.h" +#include "curl_sendf.h" -#include "progress.h" -#include "strequal.h" -#include "dict.h" -#include "rawstr.h" +#include "curl_progress.h" +#include "curl_strequal.h" +#include "curl_dict.h" +#include "curl_rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* * Forward declarations. diff --git a/lib/easy.c b/lib/easy.c index b73bf6601..b4f0390a9 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> @@ -42,35 +42,35 @@ #include <sys/param.h> #endif -#include "strequal.h" -#include "urldata.h" +#include "curl_strequal.h" +#include "curl_urldata.h" #include <curl/curl.h> -#include "transfer.h" -#include "sslgen.h" -#include "url.h" -#include "getinfo.h" -#include "hostip.h" -#include "share.h" -#include "strdup.h" +#include "curl_transfer.h" +#include "curl_sslgen.h" +#include "curl_url.h" +#include "curl_getinfo.h" +#include "curl_hostip.h" +#include "curl_share.h" +#include "curl_strdup.h" #include "curl_memory.h" -#include "progress.h" -#include "easyif.h" -#include "select.h" -#include "sendf.h" /* for failf function prototype */ +#include "curl_progress.h" +#include "curl_easyif.h" +#include "curl_select.h" +#include "curl_sendf.h" /* for failf function prototype */ #include "curl_ntlm.h" -#include "connect.h" /* for Curl_getconnectinfo */ -#include "slist.h" -#include "amigaos.h" +#include "curl_connect.h" /* for Curl_getconnectinfo */ +#include "curl_slist.h" +#include "curl_amigaos.h" #include "curl_rand.h" -#include "non-ascii.h" -#include "warnless.h" -#include "conncache.h" +#include "curl_non-ascii.h" +#include "curl_warnless.h" +#include "curl_conncache.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* win32_cleanup() is for win32 socket cleanup functionality, the opposite of win32_init() */ diff --git a/lib/escape.c b/lib/escape.c index 0dd5a1d0a..1d542618e 100644 --- a/lib/escape.c +++ b/lib/escape.c @@ -23,21 +23,21 @@ /* 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> #include "curl_memory.h" -#include "urldata.h" -#include "warnless.h" -#include "non-ascii.h" -#include "escape.h" +#include "curl_urldata.h" +#include "curl_warnless.h" +#include "curl_non-ascii.h" +#include "curl_escape.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* Portable character check (remember EBCDIC). Do not use isalnum() because its behavior is altered by the current locale. diff --git a/lib/file.c b/lib/file.c index 886a09e24..6ea2bd769 100644 --- a/lib/file.c +++ b/lib/file.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_FILE @@ -48,26 +48,26 @@ #include <fcntl.h> #endif -#include "strtoofft.h" -#include "urldata.h" +#include "curl_strtoofft.h" +#include "curl_urldata.h" #include <curl/curl.h> -#include "progress.h" -#include "sendf.h" -#include "escape.h" -#include "file.h" -#include "speedcheck.h" -#include "getinfo.h" -#include "transfer.h" -#include "url.h" +#include "curl_progress.h" +#include "curl_sendf.h" +#include "curl_escape.h" +#include "curl_file.h" +#include "curl_speedcheck.h" +#include "curl_getinfo.h" +#include "curl_transfer.h" +#include "curl_url.h" #include "curl_memory.h" -#include "parsedate.h" /* for the week day and month names */ -#include "warnless.h" +#include "curl_parsedate.h" /* for the week day and month names */ +#include "curl_warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #if defined(WIN32) || defined(MSDOS) || defined(__EMX__) || \ defined(__SYMBIAN32__) diff --git a/lib/fileinfo.c b/lib/fileinfo.c index 4ffcbbe29..433c709b5 100644 --- a/lib/fileinfo.c +++ b/lib/fileinfo.c @@ -20,17 +20,17 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" -#include "strdup.h" -#include "fileinfo.h" +#include "curl_strdup.h" +#include "curl_fileinfo.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" struct curl_fileinfo *Curl_fileinfo_alloc(void) { diff --git a/lib/formdata.c b/lib/formdata.c index 7bf883941..6b7166379 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include <curl/curl.h> @@ -33,18 +33,18 @@ #include <libgen.h> #endif -#include "urldata.h" /* for struct SessionHandle */ -#include "formdata.h" +#include "curl_urldata.h" /* for struct SessionHandle */ +#include "curl_formdata.h" #include "curl_rand.h" -#include "strequal.h" +#include "curl_strequal.h" #include "curl_memory.h" -#include "sendf.h" +#include "curl_sendf.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #endif /* !defined(CURL_DISABLE_HTTP) || defined(USE_SSLEAY) */ @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_FTP @@ -47,47 +47,47 @@ #endif #include <curl/curl.h> -#include "urldata.h" -#include "sendf.h" -#include "if2ip.h" -#include "hostip.h" -#include "progress.h" -#include "transfer.h" -#include "escape.h" -#include "http.h" /* for HTTP proxy tunnel stuff */ -#include "socks.h" -#include "ftp.h" -#include "fileinfo.h" -#include "ftplistparser.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_if2ip.h" +#include "curl_hostip.h" +#include "curl_progress.h" +#include "curl_transfer.h" +#include "curl_escape.h" +#include "curl_http.h" /* for HTTP proxy tunnel stuff */ +#include "curl_socks.h" +#include "curl_ftp.h" +#include "curl_fileinfo.h" +#include "curl_ftplistparser.h" #if defined(HAVE_KRB4) || defined(HAVE_GSSAPI) -#include "krb4.h" +#include "curl_krb4.h" #endif -#include "strtoofft.h" -#include "strequal.h" -#include "sslgen.h" -#include "connect.h" -#include "strerror.h" -#include "inet_ntop.h" -#include "inet_pton.h" -#include "select.h" -#include "parsedate.h" /* for the week day and month names */ -#include "sockaddr.h" /* required for Curl_sockaddr_storage */ -#include "multiif.h" -#include "url.h" -#include "rawstr.h" -#include "speedcheck.h" -#include "warnless.h" -#include "http_proxy.h" -#include "non-ascii.h" +#include "curl_strtoofft.h" +#include "curl_strequal.h" +#include "curl_sslgen.h" +#include "curl_connect.h" +#include "curl_strerror.h" +#include "curl_inet_ntop.h" +#include "curl_inet_pton.h" +#include "curl_select.h" +#include "curl_parsedate.h" /* for the week day and month names */ +#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */ +#include "curl_multiif.h" +#include "curl_url.h" +#include "curl_rawstr.h" +#include "curl_speedcheck.h" +#include "curl_warnless.h" +#include "curl_http_proxy.h" +#include "curl_non-ascii.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifndef NI_MAXHOST #define NI_MAXHOST 1025 @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "pingpong.h" +#include "curl_pingpong.h" #ifndef CURL_DISABLE_FTP extern const struct Curl_handler Curl_handler_ftp; diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c index 49ee4b6a6..a1a7d5187 100644 --- a/lib/ftplistparser.c +++ b/lib/ftplistparser.c @@ -35,19 +35,19 @@ * 01-29-97 11:32PM <DIR> prog */ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_FTP #include <curl/curl.h> -#include "urldata.h" -#include "fileinfo.h" -#include "llist.h" -#include "strtoofft.h" -#include "rawstr.h" -#include "ftp.h" -#include "ftplistparser.h" +#include "curl_urldata.h" +#include "curl_fileinfo.h" +#include "curl_llist.h" +#include "curl_strtoofft.h" +#include "curl_rawstr.h" +#include "curl_ftp.h" +#include "curl_ftplistparser.h" #include "curl_fnmatch.h" #define _MPRINTF_REPLACE /* use our functions only */ @@ -55,7 +55,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* allocs buffer which will contain one line of LIST command response */ #define FTP_BUFFER_ALLOCSIZE 160 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..cf8b03619 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> @@ -29,7 +29,7 @@ #include <curl/curl.h> #include "curl_memory.h" -#include "memdebug.h" +#include "curl_memdebug.h" static char *GetEnv(const char *variable) diff --git a/lib/getinfo.c b/lib/getinfo.c index 221f05a4f..0404c28ea 100644 --- a/lib/getinfo.c +++ b/lib/getinfo.c @@ -20,20 +20,20 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include <curl/curl.h> -#include "urldata.h" -#include "getinfo.h" +#include "curl_urldata.h" +#include "curl_getinfo.h" #include "curl_memory.h" -#include "sslgen.h" -#include "connect.h" /* Curl_getconnectinfo() */ -#include "progress.h" +#include "curl_sslgen.h" +#include "curl_connect.h" /* Curl_getconnectinfo() */ +#include "curl_progress.h" /* Make this the last #include */ -#include "memdebug.h" +#include "curl_memdebug.h" /* * This is supposed to be called in the beginning of a perform() session diff --git a/lib/gopher.c b/lib/gopher.c index e8f2790fc..80fc18e8e 100644 --- a/lib/gopher.c +++ b/lib/gopher.c @@ -20,29 +20,29 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_GOPHER -#include "urldata.h" +#include "curl_urldata.h" #include <curl/curl.h> -#include "transfer.h" -#include "sendf.h" +#include "curl_transfer.h" +#include "curl_sendf.h" -#include "progress.h" -#include "strequal.h" -#include "gopher.h" -#include "rawstr.h" -#include "select.h" -#include "url.h" -#include "warnless.h" +#include "curl_progress.h" +#include "curl_strequal.h" +#include "curl_gopher.h" +#include "curl_rawstr.h" +#include "curl_select.h" +#include "curl_url.h" +#include "curl_warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* * Forward declarations. diff --git a/lib/gtls.c b/lib/gtls.c index 8c2a4a0c9..4e2254109 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 @@ -42,21 +42,21 @@ #include <gcrypt.h> #endif -#include "urldata.h" -#include "sendf.h" -#include "inet_pton.h" -#include "gtls.h" -#include "sslgen.h" -#include "parsedate.h" -#include "connect.h" /* for the connect timeout */ -#include "select.h" -#include "rawstr.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_inet_pton.h" +#include "curl_gtls.h" +#include "curl_sslgen.h" +#include "curl_parsedate.h" +#include "curl_connect.h" /* for the connect timeout */ +#include "curl_select.h" +#include "curl_rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* Some hackish cast macros based on: @@ -94,7 +94,7 @@ 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 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..83cfac7fd 100644 --- a/lib/gtls.h +++ b/lib/gtls.h @@ -22,11 +22,11 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef USE_GNUTLS -#include "urldata.h" +#include "curl_urldata.h" int Curl_gtls_init(void); int Curl_gtls_cleanup(void); diff --git a/lib/hash.c b/lib/hash.c index b59e56146..732dbcf73 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -20,17 +20,17 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" -#include "hash.h" -#include "llist.h" +#include "curl_hash.h" +#include "curl_llist.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" static void hash_element_dtor(void *user, void *element) diff --git a/lib/hash.h b/lib/hash.h index 3fa621cb1..68e7933ab 100644 --- a/lib/hash.h +++ b/lib/hash.h @@ -22,11 +22,11 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include <stddef.h> -#include "llist.h" +#include "curl_llist.h" /* Hash function prototype */ typedef size_t (*hash_function) (void* key, diff --git a/lib/hmac.c b/lib/hmac.c index 4df6f79ad..692d27940 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 @@ -33,7 +33,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* * Generic HMAC algorithm. diff --git a/lib/hostasyn.c b/lib/hostasyn.c index 93e2c31cd..0097b6cfd 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> @@ -40,20 +40,20 @@ #include <process.h> #endif -#include "urldata.h" -#include "sendf.h" -#include "hostip.h" -#include "hash.h" -#include "share.h" -#include "strerror.h" -#include "url.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_hostip.h" +#include "curl_hash.h" +#include "curl_share.h" +#include "curl_strerror.h" +#include "curl_url.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /*********************************************************************** * Only for builds using asynchronous name resolves diff --git a/lib/hostcheck.c b/lib/hostcheck.c index 8affce044..a5bf8b02f 100644 --- a/lib/hostcheck.c +++ b/lib/hostcheck.c @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #if defined(USE_SSLEAY) || defined(USE_AXTLS) /* these two backends use functions from this file */ -#include "hostcheck.h" -#include "rawstr.h" +#include "curl_hostcheck.h" +#include "curl_rawstr.h" /* * Match a hostname against a wildcard pattern. diff --git a/lib/hostip.c b/lib/hostip.c index 2bfb74b42..5ba76d314 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> @@ -47,22 +47,22 @@ #include <process.h> #endif -#include "urldata.h" -#include "sendf.h" -#include "hostip.h" -#include "hash.h" -#include "share.h" -#include "strerror.h" -#include "url.h" -#include "inet_ntop.h" -#include "warnless.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_hostip.h" +#include "curl_hash.h" +#include "curl_share.h" +#include "curl_strerror.h" +#include "curl_url.h" +#include "curl_inet_ntop.h" +#include "curl_warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #if defined(CURLRES_SYNCH) && \ defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP) @@ -105,8 +105,8 @@ * asyn-ares.c - functions for ares-using name resolves * 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. + * The curl_hostip.h is the united header file for all this. It defines the + * 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..fb32d74fe 100644 --- a/lib/hostip.h +++ b/lib/hostip.h @@ -22,10 +22,10 @@ * ***************************************************************************/ -#include "setup.h" -#include "hash.h" +#include "curl_setup.h" +#include "curl_hash.h" #include "curl_addrinfo.h" -#include "asyn.h" +#include "curl_asyn.h" #ifdef HAVE_SETJMP_H #include <setjmp.h> diff --git a/lib/hostip4.c b/lib/hostip4.c index 3babe7269..5b64b4673 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> @@ -40,21 +40,21 @@ #include <process.h> #endif -#include "urldata.h" -#include "sendf.h" -#include "hostip.h" -#include "hash.h" -#include "share.h" -#include "strerror.h" -#include "url.h" -#include "inet_pton.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_hostip.h" +#include "curl_hash.h" +#include "curl_share.h" +#include "curl_strerror.h" +#include "curl_url.h" +#include "curl_inet_pton.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /*********************************************************************** * Only for plain-ipv4 builds diff --git a/lib/hostip6.c b/lib/hostip6.c index 5b25d6fc4..0081df7f5 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> @@ -40,22 +40,22 @@ #include <process.h> #endif -#include "urldata.h" -#include "sendf.h" -#include "hostip.h" -#include "hash.h" -#include "share.h" -#include "strerror.h" -#include "url.h" -#include "inet_pton.h" -#include "connect.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_hostip.h" +#include "curl_hash.h" +#include "curl_share.h" +#include "curl_strerror.h" +#include "curl_url.h" +#include "curl_inet_pton.h" +#include "curl_connect.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /*********************************************************************** * Only for ipv6-enabled builds diff --git a/lib/hostsyn.c b/lib/hostsyn.c index eff2efa7b..9a26f8d44 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> @@ -40,20 +40,20 @@ #include <process.h> #endif -#include "urldata.h" -#include "sendf.h" -#include "hostip.h" -#include "hash.h" -#include "share.h" -#include "strerror.h" -#include "url.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_hostip.h" +#include "curl_hash.h" +#include "curl_share.h" +#include "curl_strerror.h" +#include "curl_url.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /*********************************************************************** * Only for builds using synchronous name resolves diff --git a/lib/http.c b/lib/http.c index 0013e5065..4f4469c5e 100644 --- a/lib/http.c +++ b/lib/http.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_HTTP @@ -45,40 +45,40 @@ #include <sys/param.h> #endif -#include "urldata.h" +#include "curl_urldata.h" #include <curl/curl.h> -#include "transfer.h" -#include "sendf.h" -#include "formdata.h" -#include "progress.h" +#include "curl_transfer.h" +#include "curl_sendf.h" +#include "curl_formdata.h" +#include "curl_progress.h" #include "curl_base64.h" -#include "cookie.h" -#include "strequal.h" -#include "sslgen.h" -#include "http_digest.h" +#include "curl_cookie.h" +#include "curl_strequal.h" +#include "curl_sslgen.h" +#include "curl_http_digest.h" #include "curl_ntlm.h" #include "curl_ntlm_wb.h" -#include "http_negotiate.h" -#include "url.h" -#include "share.h" -#include "hostip.h" -#include "http.h" +#include "curl_http_negotiate.h" +#include "curl_url.h" +#include "curl_share.h" +#include "curl_hostip.h" +#include "curl_http.h" #include "curl_memory.h" -#include "select.h" -#include "parsedate.h" /* for the week day and month names */ -#include "strtoofft.h" -#include "multiif.h" -#include "rawstr.h" -#include "content_encoding.h" -#include "http_proxy.h" -#include "warnless.h" -#include "non-ascii.h" +#include "curl_select.h" +#include "curl_parsedate.h" /* for the week day and month names */ +#include "curl_strtoofft.h" +#include "curl_multiif.h" +#include "curl_rawstr.h" +#include "curl_content_encoding.h" +#include "curl_http_proxy.h" +#include "curl_warnless.h" +#include "curl_non-ascii.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* * Forward declarations. diff --git a/lib/http_chunks.c b/lib/http_chunks.c index d6a0bec13..050501b11 100644 --- a/lib/http_chunks.c +++ b/lib/http_chunks.c @@ -20,23 +20,23 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_HTTP -#include "urldata.h" /* it includes http_chunks.h */ -#include "sendf.h" /* for the client write stuff */ +#include "curl_urldata.h" /* it includes curl_http_chunks.h */ +#include "curl_sendf.h" /* for the client write stuff */ -#include "content_encoding.h" -#include "http.h" +#include "curl_content_encoding.h" +#include "curl_http.h" #include "curl_memory.h" -#include "non-ascii.h" /* for Curl_convert_to_network prototype */ +#include "curl_non-ascii.h" /* for Curl_convert_to_network prototype */ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* * Chunk format (simplified): diff --git a/lib/http_digest.c b/lib/http_digest.c index 17cc95e81..d835eb27b 100644 --- a/lib/http_digest.c +++ b/lib/http_digest.c @@ -20,27 +20,27 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH) -#include "urldata.h" -#include "sendf.h" -#include "rawstr.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_rawstr.h" #include "curl_base64.h" #include "curl_md5.h" -#include "http_digest.h" -#include "strtok.h" -#include "url.h" /* for Curl_safefree() */ +#include "curl_http_digest.h" +#include "curl_strtok.h" +#include "curl_url.h" #include "curl_memory.h" -#include "non-ascii.h" /* included for Curl_convert_... prototypes */ -#include "warnless.h" +#include "curl_non-ascii.h" /* included for Curl_convert_... prototypes */ +#include "curl_warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #define MAX_VALUE_LENGTH 256 #define MAX_CONTENT_LENGTH 1024 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..446c49bb9 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 @@ -30,14 +30,14 @@ #ifndef CURL_DISABLE_HTTP -#include "urldata.h" -#include "sendf.h" +#include "curl_urldata.h" +#include "curl_sendf.h" #include "curl_gssapi.h" -#include "rawstr.h" +#include "curl_rawstr.h" #include "curl_base64.h" -#include "http_negotiate.h" +#include "curl_http_negotiate.h" #include "curl_memory.h" -#include "url.h" +#include "curl_url.h" #ifdef HAVE_SPNEGO # include <spnegohelp.h> @@ -56,7 +56,7 @@ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" static int get_gss_name(struct connectdata *conn, bool proxy, gss_name_t *server) diff --git a/lib/http_negotiate_sspi.c b/lib/http_negotiate_sspi.c index 5aa4f9433..d82b27110 100644 --- a/lib/http_negotiate_sspi.c +++ b/lib/http_negotiate_sspi.c @@ -20,18 +20,18 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef USE_WINDOWS_SSPI #ifndef CURL_DISABLE_HTTP -#include "urldata.h" -#include "sendf.h" -#include "rawstr.h" -#include "warnless.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_rawstr.h" +#include "curl_warnless.h" #include "curl_base64.h" -#include "http_negotiate.h" +#include "curl_http_negotiate.h" #include "curl_memory.h" #include "curl_multibyte.h" @@ -39,7 +39,7 @@ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" static int get_gss_name(struct connectdata *conn, bool proxy, diff --git a/lib/http_proxy.c b/lib/http_proxy.c index d2e1aa199..6bbc92615 100644 --- a/lib/http_proxy.c +++ b/lib/http_proxy.c @@ -20,21 +20,21 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP) -#include "urldata.h" +#include "curl_urldata.h" #include <curl/curl.h> -#include "http_proxy.h" -#include "sendf.h" -#include "http.h" -#include "url.h" -#include "select.h" -#include "rawstr.h" -#include "progress.h" -#include "non-ascii.h" -#include "connect.h" +#include "curl_http_proxy.h" +#include "curl_sendf.h" +#include "curl_http.h" +#include "curl_url.h" +#include "curl_select.h" +#include "curl_rawstr.h" +#include "curl_progress.h" +#include "curl_non-ascii.h" +#include "curl_connect.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -43,7 +43,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" CURLcode Curl_proxy_connect(struct connectdata *conn) { diff --git a/lib/idn_win32.c b/lib/idn_win32.c index 9bc9cb810..eca225483 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 @@ -32,7 +32,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifdef WANT_IDN_PROTOTYPES WINBASEAPI int WINAPI IdnToAscii(DWORD, const WCHAR *, int, WCHAR *, int); diff --git a/lib/if2ip.c b/lib/if2ip.c index c1905d175..db9c78446 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> @@ -50,16 +50,16 @@ # include <inet.h> #endif -#include "inet_ntop.h" -#include "strequal.h" -#include "if2ip.h" +#include "curl_inet_ntop.h" +#include "curl_strequal.h" +#include "curl_if2ip.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.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 b17b2d38f..e3ff0868b 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -23,7 +23,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_IMAP @@ -50,33 +50,33 @@ #endif #include <curl/curl.h> -#include "urldata.h" -#include "sendf.h" -#include "if2ip.h" -#include "hostip.h" -#include "progress.h" -#include "transfer.h" -#include "escape.h" -#include "http.h" /* for HTTP proxy tunnel stuff */ -#include "socks.h" -#include "imap.h" - -#include "strtoofft.h" -#include "strequal.h" -#include "sslgen.h" -#include "connect.h" -#include "strerror.h" -#include "select.h" -#include "multiif.h" -#include "url.h" -#include "rawstr.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_if2ip.h" +#include "curl_hostip.h" +#include "curl_progress.h" +#include "curl_transfer.h" +#include "curl_escape.h" +#include "curl_http.h" /* for HTTP proxy tunnel stuff */ +#include "curl_socks.h" +#include "curl_imap.h" + +#include "curl_strtoofft.h" +#include "curl_strequal.h" +#include "curl_sslgen.h" +#include "curl_connect.h" +#include "curl_strerror.h" +#include "curl_select.h" +#include "curl_multiif.h" +#include "curl_url.h" +#include "curl_rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* Local API functions */ static CURLcode imap_parse_url_path(struct connectdata *conn); diff --git a/lib/imap.h b/lib/imap.h index 02ea346ad..720079008 100644 --- a/lib/imap.h +++ b/lib/imap.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "pingpong.h" +#include "curl_pingpong.h" /**************************************************************************** * IMAP unique setup diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c index 1ff975667..b184029f6 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 @@ -35,7 +35,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "inet_ntop.h" +#include "curl_inet_ntop.h" #define IN6ADDRSZ 16 #define INADDRSZ 4 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..175f938cd 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 @@ -30,7 +30,7 @@ #include <arpa/inet.h> #endif -#include "inet_pton.h" +#include "curl_inet_pton.h" #define IN6ADDRSZ 16 #define INADDRSZ 4 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..8ba326ed7 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 @@ -50,16 +50,16 @@ #include <krb.h> #include <des.h> -#include "urldata.h" +#include "curl_urldata.h" #include "curl_base64.h" -#include "ftp.h" -#include "sendf.h" -#include "krb4.h" -#include "inet_ntop.h" +#include "curl_ftp.h" +#include "curl_sendf.h" +#include "curl_krb4.h" +#include "curl_inet_ntop.h" #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #define LOCAL_ADDR (&conn->local_addr) #define REMOTE_ADDR conn->ip_addr->ai_addr diff --git a/lib/krb5.c b/lib/krb5.c index c51041dda..f5389c857 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 @@ -46,20 +46,20 @@ #include <netdb.h> #endif -#include "urldata.h" +#include "curl_urldata.h" #include "curl_base64.h" -#include "ftp.h" +#include "curl_ftp.h" #include "curl_gssapi.h" -#include "sendf.h" -#include "krb4.h" +#include "curl_sendf.h" +#include "curl_krb4.h" #include "curl_memory.h" -#include "warnless.h" +#include "curl_warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #define LOCAL_ADDR (&conn->local_addr) #define REMOTE_ADDR conn->ip_addr->ai_addr diff --git a/lib/ldap.c b/lib/ldap.c index 9ef31008c..76c2984ee 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) @@ -54,23 +54,23 @@ # endif /* HAVE_LDAP_SSL && HAVE_LDAP_SSL_H */ #endif -#include "urldata.h" +#include "curl_urldata.h" #include <curl/curl.h> -#include "sendf.h" -#include "escape.h" -#include "progress.h" -#include "transfer.h" -#include "strequal.h" -#include "strtok.h" +#include "curl_sendf.h" +#include "curl_escape.h" +#include "curl_progress.h" +#include "curl_transfer.h" +#include "curl_strequal.h" +#include "curl_strtok.h" #include "curl_ldap.h" #include "curl_memory.h" #include "curl_base64.h" -#include "rawstr.h" +#include "curl_rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memdebug.h" +#include "curl_memdebug.h" #ifndef HAVE_LDAP_URL_PARSE diff --git a/lib/llist.c b/lib/llist.c index a302e32d5..46a8d9960 100644 --- a/lib/llist.c +++ b/lib/llist.c @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" -#include "llist.h" +#include "curl_llist.h" #include "curl_memory.h" /* this must be the last include file */ -#include "memdebug.h" +#include "curl_memdebug.h" /* * @unittest: 1300 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,14 +20,14 @@ 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 */ #ifdef USE_NSS #include "curl_md4.h" -#include "warnless.h" +#include "curl_warnless.h" typedef unsigned int UINT4; @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_CRYPTO_AUTH #include "curl_md5.h" #include "curl_hmac.h" -#include "warnless.h" +#include "curl_warnless.h" #include "curl_memory.h" @@ -34,7 +34,7 @@ #include <nettle/md5.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" typedef struct md5_ctx MD5_CTX; @@ -59,7 +59,7 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX * ctx) #include <gcrypt.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" typedef gcry_md_hd_t MD5_CTX; @@ -443,7 +443,7 @@ static void Decode (UINT4 *output, #endif /* CRYPTO LIBS */ /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" const HMAC_params Curl_HMAC_MD5[] = { { diff --git a/lib/memdebug.c b/lib/memdebug.c index c95f41fc5..e756126b2 100644 --- a/lib/memdebug.c +++ b/lib/memdebug.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef CURLDEBUG @@ -28,11 +28,11 @@ #define _MPRINTF_REPLACE #include <curl/mprintf.h> -#include "urldata.h" +#include "curl_urldata.h" #define MEMDEBUG_NODEFINES /* don't redefine the standard functions */ #include "curl_memory.h" -#include "memdebug.h" +#include "curl_memdebug.h" #ifndef HAVE_ASSERT_H # define assert(x) Curl_nop_stmt 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..cbd604d36 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 */ @@ -45,7 +45,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifndef SIZEOF_LONG_DOUBLE #define SIZEOF_LONG_DOUBLE 0 diff --git a/lib/multi.c b/lib/multi.c index dae1f6b56..c4f21628d 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -20,32 +20,32 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include <curl/curl.h> -#include "urldata.h" -#include "transfer.h" -#include "url.h" -#include "connect.h" -#include "progress.h" -#include "easyif.h" -#include "multiif.h" -#include "sendf.h" -#include "timeval.h" -#include "http.h" -#include "select.h" -#include "warnless.h" -#include "speedcheck.h" -#include "conncache.h" -#include "bundles.h" +#include "curl_urldata.h" +#include "curl_transfer.h" +#include "curl_url.h" +#include "curl_connect.h" +#include "curl_progress.h" +#include "curl_easyif.h" +#include "curl_multiif.h" +#include "curl_sendf.h" +#include "curl_timeval.h" +#include "curl_http.h" +#include "curl_select.h" +#include "curl_warnless.h" +#include "curl_speedcheck.h" +#include "curl_conncache.h" +#include "curl_bundles.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* CURL_SOCKET_HASH_TABLE_SIZE should be a prime number. Increasing it from 97 diff --git a/lib/netrc.c b/lib/netrc.c index 162a86caa..10853d395 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> @@ -30,18 +30,18 @@ #endif #include <curl/curl.h> -#include "netrc.h" +#include "curl_netrc.h" -#include "strequal.h" -#include "strtok.h" +#include "curl_strequal.h" +#include "curl_strtok.h" #include "curl_memory.h" -#include "rawstr.h" +#include "curl_rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* Get user and password from .netrc when given a machine name */ diff --git a/lib/non-ascii.c b/lib/non-ascii.c index 8e29227c0..b966b5bbf 100644 --- a/lib/non-ascii.c +++ b/lib/non-ascii.c @@ -20,20 +20,20 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef CURL_DOES_CONVERSIONS #include <curl/curl.h> -#include "non-ascii.h" -#include "formdata.h" -#include "sendf.h" -#include "urldata.h" +#include "curl_non-ascii.h" +#include "curl_formdata.h" +#include "curl_sendf.h" +#include "curl_urldata.h" #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifdef HAVE_ICONV #include <iconv.h> diff --git a/lib/non-ascii.h b/lib/non-ascii.h index 6dcbe0044..552a51311 100644 --- a/lib/non-ascii.h +++ b/lib/non-ascii.h @@ -21,11 +21,11 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef CURL_DOES_CONVERSIONS -#include "urldata.h" +#include "curl_urldata.h" /* * Curl_convert_clone() returns a malloced copy of the source string (if diff --git a/lib/nonblock.c b/lib/nonblock.c index a2722ed7f..6e6d1287f 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> @@ -37,7 +37,7 @@ #include <inet.h> #endif -#include "nonblock.h" +#include "curl_nonblock.h" /* * curlx_nonblock() set the given socket to either blocking or non-blocking @@ -25,24 +25,24 @@ * but sslgen.c should ever call or use these functions. */ -#include "setup.h" +#include "curl_setup.h" #ifdef USE_NSS -#include "urldata.h" -#include "sendf.h" -#include "formdata.h" /* for the boundary function */ -#include "url.h" /* for the ssl config check function */ -#include "connect.h" -#include "strequal.h" -#include "select.h" -#include "sslgen.h" -#include "llist.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_formdata.h" /* for the boundary function */ +#include "curl_url.h" /* for the ssl config check function */ +#include "curl_connect.h" +#include "curl_strequal.h" +#include "curl_select.h" +#include "curl_sslgen.h" +#include "curl_llist.h" #define _MPRINTF_REPLACE /* use the internal *printf() functions */ #include <curl/mprintf.h> -#include "nssg.h" +#include "curl_nssg.h" #include <nspr.h> #include <nss.h> #include <ssl.h> @@ -61,11 +61,11 @@ #include <prerror.h> #include "curl_memory.h" -#include "rawstr.h" -#include "warnless.h" +#include "curl_rawstr.h" +#include "curl_warnless.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #define SSL_DIR "/etc/pki/nssdb" diff --git a/lib/nssg.h b/lib/nssg.h index 647b7bb28..c98c37f14 100644 --- a/lib/nssg.h +++ b/lib/nssg.h @@ -21,14 +21,14 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef USE_NSS /* * This header should only be needed to get included by sslgen.c and nss.c */ -#include "urldata.h" +#include "curl_urldata.h" CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex); CURLcode Curl_nss_connect_nonblocking(struct connectdata *conn, diff --git a/lib/nwlib.c b/lib/nwlib.c index c67342a08..f63f16b83 100644 --- a/lib/nwlib.c +++ b/lib/nwlib.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef NETWARE /* Novell NetWare */ @@ -34,7 +34,7 @@ #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" typedef struct { 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..08c06f10d 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) @@ -38,11 +38,11 @@ #include <ldap.h> -#include "urldata.h" +#include "curl_urldata.h" #include <curl/curl.h> -#include "sendf.h" -#include "sslgen.h" -#include "transfer.h" +#include "curl_sendf.h" +#include "curl_sslgen.h" +#include "curl_transfer.h" #include "curl_ldap.h" #include "curl_memory.h" #include "curl_base64.h" @@ -50,7 +50,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memdebug.h" +#include "curl_memdebug.h" #ifndef _LDAP_PVT_H extern int ldap_pvt_url_scheme2proto(const char *); diff --git a/lib/parsedate.c b/lib/parsedate.c index b6079bc8f..a50b6074e 100644 --- a/lib/parsedate.c +++ b/lib/parsedate.c @@ -73,16 +73,16 @@ */ -#include "setup.h" +#include "curl_setup.h" #ifdef HAVE_LIMITS_H #include <limits.h> #endif #include <curl/curl.h> -#include "rawstr.h" -#include "warnless.h" -#include "parsedate.h" +#include "curl_rawstr.h" +#include "curl_warnless.h" +#include "curl_parsedate.h" const char * const Curl_wkday[] = {"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"}; diff --git a/lib/pingpong.c b/lib/pingpong.c index 85a7a45af..468174457 100644 --- a/lib/pingpong.c +++ b/lib/pingpong.c @@ -23,23 +23,23 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" -#include "urldata.h" -#include "sendf.h" -#include "select.h" -#include "progress.h" -#include "speedcheck.h" -#include "pingpong.h" -#include "multiif.h" -#include "non-ascii.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_select.h" +#include "curl_progress.h" +#include "curl_speedcheck.h" +#include "curl_pingpong.h" +#include "curl_multiif.h" +#include "curl_non-ascii.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifdef USE_PINGPONG diff --git a/lib/pingpong.h b/lib/pingpong.h index 1d104cfbc..77060786a 100644 --- a/lib/pingpong.h +++ b/lib/pingpong.h @@ -22,14 +22,14 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_FTP) || \ !defined(CURL_DISABLE_POP3) || !defined(CURL_DISABLE_SMTP) #define USE_PINGPONG #endif -/* forward-declaration, this is defined in urldata.h */ +/* forward-declaration, this is defined in curl_urldata.h */ struct connectdata; /* diff --git a/lib/polarssl.c b/lib/polarssl.c index ef074be13..35794224b 100644 --- a/lib/polarssl.c +++ b/lib/polarssl.c @@ -27,7 +27,7 @@ * */ -#include "setup.h" +#include "curl_setup.h" #ifdef USE_POLARSSL @@ -49,21 +49,21 @@ #define POLARSSL_ERR_NET_WANT_WRITE POLARSSL_ERR_NET_TRY_AGAIN #endif -#include "urldata.h" -#include "sendf.h" -#include "inet_pton.h" -#include "polarssl.h" -#include "sslgen.h" -#include "parsedate.h" -#include "connect.h" /* for the connect timeout */ -#include "select.h" -#include "rawstr.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_inet_pton.h" +#include "curl_polarssl.h" +#include "curl_sslgen.h" +#include "curl_parsedate.h" +#include "curl_connect.h" /* for the connect timeout */ +#include "curl_select.h" +#include "curl_rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* version dependent differences */ #if POLARSSL_VERSION_NUMBER < 0x01010000 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 7fb4f5c35..60b98237c 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -29,7 +29,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_POP3 @@ -56,36 +56,36 @@ #endif #include <curl/curl.h> -#include "urldata.h" -#include "sendf.h" -#include "if2ip.h" -#include "hostip.h" -#include "progress.h" -#include "transfer.h" -#include "escape.h" -#include "http.h" /* for HTTP proxy tunnel stuff */ -#include "socks.h" -#include "pop3.h" - -#include "strtoofft.h" -#include "strequal.h" -#include "sslgen.h" -#include "connect.h" -#include "strerror.h" -#include "select.h" -#include "multiif.h" -#include "url.h" -#include "rawstr.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_if2ip.h" +#include "curl_hostip.h" +#include "curl_progress.h" +#include "curl_transfer.h" +#include "curl_escape.h" +#include "curl_http.h" /* for HTTP proxy tunnel stuff */ +#include "curl_socks.h" +#include "curl_pop3.h" + +#include "curl_strtoofft.h" +#include "curl_strequal.h" +#include "curl_sslgen.h" +#include "curl_connect.h" +#include "curl_strerror.h" +#include "curl_select.h" +#include "curl_multiif.h" +#include "curl_url.h" +#include "curl_rawstr.h" #include "curl_sasl.h" #include "curl_md5.h" -#include "warnless.h" +#include "curl_warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* Local API functions */ static CURLcode pop3_parse_url_path(struct connectdata *conn); diff --git a/lib/progress.c b/lib/progress.c index e73f01811..88f802d0a 100644 --- a/lib/progress.c +++ b/lib/progress.c @@ -20,11 +20,11 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" -#include "urldata.h" -#include "sendf.h" -#include "progress.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_progress.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> diff --git a/lib/progress.h b/lib/progress.h index f97fef996..e68f80416 100644 --- a/lib/progress.h +++ b/lib/progress.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "timeval.h" +#include "curl_timeval.h" typedef enum { diff --git a/lib/qssl.c b/lib/qssl.c index 172df3141..d140dc9eb 100644 --- a/lib/qssl.c +++ b/lib/qssl.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef USE_QSOSSL @@ -31,15 +31,15 @@ #endif #include <curl/curl.h> -#include "urldata.h" -#include "sendf.h" -#include "qssl.h" -#include "sslgen.h" -#include "connect.h" /* for the connect timeout */ -#include "select.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_qssl.h" +#include "curl_sslgen.h" +#include "curl_connect.h" /* for the connect timeout */ +#include "curl_select.h" #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" int Curl_qsossl_init(void) diff --git a/lib/qssl.h b/lib/qssl.h index a523cb1f3..3801a1185 100644 --- a/lib/qssl.h +++ b/lib/qssl.h @@ -21,13 +21,13 @@ * 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 */ -#include "urldata.h" +#include "curl_urldata.h" #ifdef USE_QSOSSL int Curl_qsossl_init(void); diff --git a/lib/rawstr.c b/lib/rawstr.c index 2cf2fe7cb..17fd1f3f5 100644 --- a/lib/rawstr.c +++ b/lib/rawstr.c @@ -20,9 +20,9 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" -#include "rawstr.h" +#include "curl_rawstr.h" /* Portable, consistent toupper (remember EBCDIC). Do not use toupper() because its behavior is altered by the current locale. */ diff --git a/lib/rtsp.c b/lib/rtsp.c index ca9788ef7..917c6f20e 100644 --- a/lib/rtsp.c +++ b/lib/rtsp.c @@ -20,29 +20,29 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_RTSP -#include "urldata.h" +#include "curl_urldata.h" #include <curl/curl.h> -#include "transfer.h" -#include "sendf.h" -#include "multiif.h" -#include "http.h" -#include "url.h" -#include "progress.h" -#include "rtsp.h" -#include "rawstr.h" +#include "curl_transfer.h" +#include "curl_sendf.h" +#include "curl_multiif.h" +#include "curl_http.h" +#include "curl_url.h" +#include "curl_progress.h" +#include "curl_rtsp.h" +#include "curl_rawstr.h" #include "curl_memory.h" -#include "select.h" -#include "connect.h" +#include "curl_select.h" +#include "curl_connect.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* * TODO (general) diff --git a/lib/security.c b/lib/security.c index b70310b89..b7544ffbd 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) @@ -54,17 +54,17 @@ #include <limits.h> #endif -#include "urldata.h" +#include "curl_urldata.h" #include "curl_base64.h" #include "curl_memory.h" -#include "krb4.h" -#include "ftp.h" -#include "sendf.h" -#include "rawstr.h" -#include "warnless.h" +#include "curl_krb4.h" +#include "curl_ftp.h" +#include "curl_sendf.h" +#include "curl_rawstr.h" +#include "curl_warnless.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" static const struct { enum protection_level level; diff --git a/lib/select.c b/lib/select.c index 32b6fa55f..d4519d39e 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> @@ -41,10 +41,10 @@ #include <curl/curl.h> -#include "urldata.h" -#include "connect.h" -#include "select.h" -#include "warnless.h" +#include "curl_urldata.h" +#include "curl_connect.h" +#include "curl_select.h" +#include "curl_warnless.h" /* Convenience local macros */ 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..35f0d0ea9 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -20,34 +20,34 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include <curl/curl.h> -#include "urldata.h" -#include "sendf.h" -#include "connect.h" -#include "sslgen.h" -#include "ssh.h" -#include "multiif.h" -#include "non-ascii.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_connect.h" +#include "curl_sslgen.h" +#include "curl_ssh.h" +#include "curl_multiif.h" +#include "curl_non-ascii.h" #define _MPRINTF_REPLACE /* use the internal *printf() functions */ #include <curl/mprintf.h> /* the krb4 functions only exists for FTP and if krb4 or gssapi is defined */ #if !defined(CURL_DISABLE_FTP) && (defined(HAVE_KRB4) || defined(HAVE_GSSAPI)) -#include "krb4.h" +#include "curl_krb4.h" #else #define Curl_sec_send(a,b,c,d) -1 #define Curl_sec_read(a,b,c,d) -1 #endif #include "curl_memory.h" -#include "strerror.h" +#include "curl_strerror.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifdef CURL_DO_LINEEND_CONV /* @@ -385,7 +385,7 @@ static CURLcode pausewrite(struct SessionHandle *data, /* Curl_client_write() sends data to the write callback(s) The bit pattern defines to what "streams" to write to. Body and/or header. - The defines are in sendf.h of course. + The defines are in curl_sendf.h of course. If CURL_DO_LINEEND_CONV is enabled, data is converted IN PLACE to the local character encoding. This is a problem and should be changed in 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/setup.h b/lib/setup.h index 6d2dc90a8..291567e42 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -645,8 +645,8 @@ int netware_init(void); * Include macros and defines that should only be processed once. */ -#ifndef __SETUP_ONCE_H -#include "setup_once.h" +#ifndef HEADER_CURL_SETUP_ONCE_H +#include "curl_setup_once.h" #endif /* diff --git a/lib/share.c b/lib/share.c index 477c35b0b..182e6e99b 100644 --- a/lib/share.c +++ b/lib/share.c @@ -20,16 +20,16 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include <curl/curl.h> -#include "urldata.h" -#include "share.h" -#include "sslgen.h" +#include "curl_urldata.h" +#include "curl_share.h" +#include "curl_sslgen.h" #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" CURLSH * curl_share_init(void) diff --git a/lib/share.h b/lib/share.h index b9e6c2538..ecf6f2a79 100644 --- a/lib/share.h +++ b/lib/share.h @@ -22,10 +22,10 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include <curl/curl.h> -#include "cookie.h" -#include "urldata.h" +#include "curl_cookie.h" +#include "curl_urldata.h" /* SalfordC says "A structure member may not be volatile". Hence: */ diff --git a/lib/slist.c b/lib/slist.c index 4ddebb609..2a30ea620 100644 --- a/lib/slist.c +++ b/lib/slist.c @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include "curl_memory.h" -#include "slist.h" +#include "curl_slist.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* returns last node in linked list */ static struct curl_slist *slist_get_last(struct curl_slist *list) diff --git a/lib/smtp.c b/lib/smtp.c index dd39b83b6..af1eb40f8 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -27,7 +27,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_SMTP @@ -54,36 +54,36 @@ #endif #include <curl/curl.h> -#include "urldata.h" -#include "sendf.h" -#include "if2ip.h" -#include "hostip.h" -#include "progress.h" -#include "transfer.h" -#include "escape.h" -#include "http.h" /* for HTTP proxy tunnel stuff */ -#include "socks.h" -#include "smtp.h" - -#include "strtoofft.h" -#include "strequal.h" -#include "sslgen.h" -#include "connect.h" -#include "strerror.h" -#include "select.h" -#include "multiif.h" -#include "url.h" -#include "rawstr.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_if2ip.h" +#include "curl_hostip.h" +#include "curl_progress.h" +#include "curl_transfer.h" +#include "curl_escape.h" +#include "curl_http.h" /* for HTTP proxy tunnel stuff */ +#include "curl_socks.h" +#include "curl_smtp.h" + +#include "curl_strtoofft.h" +#include "curl_strequal.h" +#include "curl_sslgen.h" +#include "curl_connect.h" +#include "curl_strerror.h" +#include "curl_select.h" +#include "curl_multiif.h" +#include "curl_url.h" +#include "curl_rawstr.h" #include "curl_gethostname.h" #include "curl_sasl.h" -#include "warnless.h" +#include "curl_warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* Local API functions */ static CURLcode smtp_regular_transfer(struct connectdata *conn, bool *done); diff --git a/lib/smtp.h b/lib/smtp.h index d30c10a8c..2f919d199 100644 --- a/lib/smtp.h +++ b/lib/smtp.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "pingpong.h" +#include "curl_pingpong.h" /**************************************************************************** * SMTP unique setup 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..1b70dd629 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) @@ -31,16 +31,16 @@ #include <arpa/inet.h> #endif -#include "urldata.h" -#include "sendf.h" -#include "strequal.h" -#include "select.h" -#include "connect.h" -#include "timeval.h" -#include "socks.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_strequal.h" +#include "curl_select.h" +#include "curl_connect.h" +#include "curl_timeval.h" +#include "curl_socks.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* * Helper read-from-socket functions. Does the same as Curl_read() but it 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..2bd3d4508 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 @@ -35,19 +35,19 @@ #endif #include "curl_gssapi.h" -#include "urldata.h" -#include "sendf.h" -#include "connect.h" -#include "timeval.h" -#include "socks.h" -#include "warnless.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_connect.h" +#include "curl_timeval.h" +#include "curl_socks.h" +#include "curl_warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" static gss_ctx_id_t gss_context = GSS_C_NO_CONTEXT; diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c index 6e95e3c35..c57610717 100644 --- a/lib/socks_sspi.c +++ b/lib/socks_sspi.c @@ -21,26 +21,26 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_PROXY) -#include "urldata.h" -#include "sendf.h" -#include "connect.h" -#include "strerror.h" -#include "timeval.h" -#include "socks.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_connect.h" +#include "curl_strerror.h" +#include "curl_timeval.h" +#include "curl_socks.h" #include "curl_sspi.h" #include "curl_multibyte.h" -#include "warnless.h" +#include "curl_warnless.h" #define _MPRINTF_REPLACE /* use the internal *printf() functions */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* * Definitions required from ntsecapi.h are directly provided below this point diff --git a/lib/speedcheck.c b/lib/speedcheck.c index ca2323f57..b9ce77dbf 100644 --- a/lib/speedcheck.c +++ b/lib/speedcheck.c @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include <curl/curl.h> -#include "urldata.h" -#include "sendf.h" -#include "multiif.h" -#include "speedcheck.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_multiif.h" +#include "curl_speedcheck.h" void Curl_speedinit(struct SessionHandle *data) { diff --git a/lib/speedcheck.h b/lib/speedcheck.h index fc40e7d0c..a933781c0 100644 --- a/lib/speedcheck.h +++ b/lib/speedcheck.h @@ -22,9 +22,9 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" -#include "timeval.h" +#include "curl_timeval.h" void Curl_speedinit(struct SessionHandle *data); CURLcode Curl_speedcheck(struct SessionHandle *data, diff --git a/lib/splay.c b/lib/splay.c index b6664e6df..21f1d222e 100644 --- a/lib/splay.c +++ b/lib/splay.c @@ -20,9 +20,9 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" -#include "splay.h" +#include "curl_splay.h" /* * This macro compares two node keys i and j and returns: 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 @@ -60,36 +60,36 @@ #endif #include <curl/curl.h> -#include "urldata.h" -#include "sendf.h" -#include "hostip.h" -#include "progress.h" -#include "transfer.h" -#include "escape.h" -#include "http.h" /* for HTTP proxy tunnel stuff */ -#include "ssh.h" -#include "url.h" -#include "speedcheck.h" -#include "getinfo.h" - -#include "strequal.h" -#include "sslgen.h" -#include "connect.h" -#include "strerror.h" -#include "inet_ntop.h" -#include "parsedate.h" /* for the week day and month names */ -#include "sockaddr.h" /* required for Curl_sockaddr_storage */ -#include "strtoofft.h" -#include "multiif.h" -#include "select.h" -#include "warnless.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_hostip.h" +#include "curl_progress.h" +#include "curl_transfer.h" +#include "curl_escape.h" +#include "curl_http.h" /* for HTTP proxy tunnel stuff */ +#include "curl_ssh.h" +#include "curl_url.h" +#include "curl_speedcheck.h" +#include "curl_getinfo.h" + +#include "curl_strequal.h" +#include "curl_sslgen.h" +#include "curl_connect.h" +#include "curl_strerror.h" +#include "curl_inet_ntop.h" +#include "curl_parsedate.h" /* for the week day and month names */ +#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */ +#include "curl_strtoofft.h" +#include "curl_multiif.h" +#include "curl_select.h" +#include "curl_warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifdef WIN32 # undef PATH_MAX @@ -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..d85ba8ae6 100644 --- a/lib/sslgen.c +++ b/lib/sslgen.c @@ -43,28 +43,28 @@ http://httpd.apache.org/docs-2.0/ssl/ssl_intro.html */ -#include "setup.h" +#include "curl_setup.h" -#include "urldata.h" +#include "curl_urldata.h" #define SSLGEN_C -#include "sslgen.h" /* generic SSL protos etc */ -#include "ssluse.h" /* OpenSSL versions */ -#include "gtls.h" /* GnuTLS versions */ -#include "nssg.h" /* NSS versions */ -#include "qssl.h" /* QSOSSL versions */ -#include "polarssl.h" /* PolarSSL versions */ -#include "axtls.h" /* axTLS versions */ -#include "cyassl.h" /* CyaSSL versions */ +#include "curl_sslgen.h" /* generic SSL protos etc */ +#include "curl_ssluse.h" /* OpenSSL versions */ +#include "curl_gtls.h" /* GnuTLS versions */ +#include "curl_nssg.h" /* NSS versions */ +#include "curl_qssl.h" /* QSOSSL versions */ +#include "curl_polarssl.h" /* PolarSSL versions */ +#include "curl_axtls.h" /* axTLS versions */ +#include "curl_cyassl.h" /* CyaSSL versions */ #include "curl_schannel.h" /* Schannel SSPI version */ #include "curl_darwinssl.h" /* SecureTransport (Darwin) version */ -#include "sendf.h" -#include "rawstr.h" -#include "url.h" +#include "curl_sendf.h" +#include "curl_rawstr.h" +#include "curl_url.h" #include "curl_memory.h" -#include "progress.h" -#include "share.h" +#include "curl_progress.h" +#include "curl_share.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* convenience macro to check if this handle is using a shared SSL session */ #define SSLSESSION_SHARED(data) (data->share && \ 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..c5e56099b 100644 --- a/lib/ssluse.c +++ b/lib/ssluse.c @@ -30,24 +30,24 @@ * Sampo Kellomaki 1998. */ -#include "setup.h" +#include "curl_setup.h" #ifdef HAVE_LIMITS_H #include <limits.h> #endif -#include "urldata.h" -#include "sendf.h" -#include "formdata.h" /* for the boundary function */ -#include "url.h" /* for the ssl config check function */ -#include "inet_pton.h" -#include "ssluse.h" -#include "connect.h" -#include "strequal.h" -#include "select.h" -#include "sslgen.h" -#include "rawstr.h" -#include "hostcheck.h" +#include "curl_urldata.h" +#include "curl_sendf.h" +#include "curl_formdata.h" /* for the boundary function */ +#include "curl_url.h" /* for the ssl config check function */ +#include "curl_inet_pton.h" +#include "curl_ssluse.h" +#include "curl_connect.h" +#include "curl_strequal.h" +#include "curl_select.h" +#include "curl_sslgen.h" +#include "curl_rawstr.h" +#include "curl_hostcheck.h" #define _MPRINTF_REPLACE /* use the internal *printf() functions */ #include <curl/mprintf.h> @@ -67,12 +67,12 @@ #include <md5.h> #endif -#include "warnless.h" +#include "curl_warnless.h" #include "curl_memory.h" -#include "non-ascii.h" /* for Curl_convert_from_utf8 prototype */ +#include "curl_non-ascii.h" /* for Curl_convert_from_utf8 prototype */ /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifndef OPENSSL_VERSION_NUMBER #error "OPENSSL_VERSION_NUMBER not defined" diff --git a/lib/ssluse.h b/lib/ssluse.h index 5375a6a65..42e999eec 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -22,14 +22,14 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef USE_SSLEAY /* * This header should only be needed to get included by sslgen.c and ssluse.c */ -#include "urldata.h" +#include "curl_urldata.h" CURLcode Curl_ossl_connect(struct connectdata *conn, int sockindex); CURLcode Curl_ossl_connect_nonblocking(struct connectdata *conn, diff --git a/lib/strdup.c b/lib/strdup.c index 27014354d..8dcaa67f0 100644 --- a/lib/strdup.c +++ b/lib/strdup.c @@ -22,9 +22,9 @@ /* * This file is 'mem-include-scan' clean. See test 1132. */ -#include "setup.h" +#include "curl_setup.h" -#include "strdup.h" +#include "curl_strdup.h" #ifndef HAVE_STRDUP char *curlx_strdup(const char *str) 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..5d370c854 100644 --- a/lib/strequal.c +++ b/lib/strequal.c @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef HAVE_STRINGS_H #include <strings.h> #endif -#include "strequal.h" +#include "curl_strequal.h" /* * @unittest: 1301 diff --git a/lib/strerror.c b/lib/strerror.c index 0c82a53e4..27567a1ac 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) && \ @@ -39,14 +39,14 @@ #include <idna.h> #endif -#include "strerror.h" +#include "curl_strerror.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" const char * curl_easy_strerror(CURLcode error) diff --git a/lib/strerror.h b/lib/strerror.h index f1b22210a..60f193f97 100644 --- a/lib/strerror.h +++ b/lib/strerror.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "urldata.h" +#include "curl_urldata.h" const char *Curl_strerror (struct connectdata *conn, int err); diff --git a/lib/strtok.c b/lib/strtok.c index 94eac0e64..33bdd96af 100644 --- a/lib/strtok.c +++ b/lib/strtok.c @@ -20,12 +20,12 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef HAVE_STRTOK_R #include <stddef.h> -#include "strtok.h" +#include "curl_strtok.h" char * Curl_strtok_r(char *ptr, const char *sep, char **end) 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..d203d9cc7 100644 --- a/lib/strtoofft.c +++ b/lib/strtoofft.c @@ -20,9 +20,9 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" -#include "strtoofft.h" +#include "curl_strtoofft.h" /* * NOTE: 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..54eab1c92 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_TELNET @@ -44,13 +44,13 @@ #include <sys/param.h> #endif -#include "urldata.h" +#include "curl_urldata.h" #include <curl/curl.h> -#include "transfer.h" -#include "sendf.h" -#include "telnet.h" -#include "connect.h" -#include "progress.h" +#include "curl_transfer.h" +#include "curl_sendf.h" +#include "curl_telnet.h" +#include "curl_connect.h" +#include "curl_progress.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -58,15 +58,15 @@ #define TELOPTS #define TELCMDS -#include "arpa_telnet.h" +#include "curl_arpa_telnet.h" #include "curl_memory.h" -#include "select.h" -#include "strequal.h" -#include "rawstr.h" -#include "warnless.h" +#include "curl_select.h" +#include "curl_strequal.h" +#include "curl_rawstr.h" +#include "curl_warnless.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #define SUBBUFSIZE 512 diff --git a/lib/tftp.c b/lib/tftp.c index 97276ea99..39d9f58e5 100644 --- a/lib/tftp.c +++ b/lib/tftp.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_TFTP @@ -44,27 +44,27 @@ #include <sys/param.h> #endif -#include "urldata.h" +#include "curl_urldata.h" #include <curl/curl.h> -#include "transfer.h" -#include "sendf.h" -#include "tftp.h" -#include "progress.h" -#include "connect.h" -#include "strerror.h" -#include "sockaddr.h" /* required for Curl_sockaddr_storage */ -#include "multiif.h" -#include "url.h" -#include "rawstr.h" +#include "curl_transfer.h" +#include "curl_sendf.h" +#include "curl_tftp.h" +#include "curl_progress.h" +#include "curl_connect.h" +#include "curl_strerror.h" +#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */ +#include "curl_multiif.h" +#include "curl_url.h" +#include "curl_rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" -#include "select.h" +#include "curl_select.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* RFC2348 allows the block size to be negotiated */ #define TFTP_BLKSIZE_DEFAULT 512 diff --git a/lib/timeval.c b/lib/timeval.c index 2fd720144..8e4c7bd76 100644 --- a/lib/timeval.c +++ b/lib/timeval.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "timeval.h" +#include "curl_timeval.h" #if defined(WIN32) && !defined(MSDOS) 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..c37f6c6b2 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -20,11 +20,11 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" -#include "strtoofft.h" -#include "strequal.h" -#include "rawstr.h" +#include "curl_strtoofft.h" +#include "curl_strequal.h" +#include "curl_rawstr.h" #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -57,35 +57,35 @@ #error "We can't compile without socket() support!" #endif -#include "urldata.h" +#include "curl_urldata.h" #include <curl/curl.h> -#include "netrc.h" - -#include "content_encoding.h" -#include "hostip.h" -#include "transfer.h" -#include "sendf.h" -#include "speedcheck.h" -#include "progress.h" -#include "http.h" -#include "url.h" -#include "getinfo.h" -#include "sslgen.h" -#include "http_digest.h" +#include "curl_netrc.h" + +#include "curl_content_encoding.h" +#include "curl_hostip.h" +#include "curl_transfer.h" +#include "curl_sendf.h" +#include "curl_speedcheck.h" +#include "curl_progress.h" +#include "curl_http.h" +#include "curl_url.h" +#include "curl_getinfo.h" +#include "curl_sslgen.h" +#include "curl_http_digest.h" #include "curl_ntlm.h" -#include "http_negotiate.h" -#include "share.h" +#include "curl_http_negotiate.h" +#include "curl_share.h" #include "curl_memory.h" -#include "select.h" -#include "multiif.h" -#include "connect.h" -#include "non-ascii.h" +#include "curl_select.h" +#include "curl_multiif.h" +#include "curl_connect.h" +#include "curl_non-ascii.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #define CURL_TIMEOUT_EXPECT_100 1000 /* counting ms here */ @@ -1725,7 +1725,7 @@ CURLcode Curl_follow(struct SessionHandle *data, char *newurl, /* this 'newurl' is the Location: string, and it must be malloc()ed before passed here */ - followtype type) /* see transfer.h */ + followtype type) /* see curl_transfer.h */ { #ifdef CURL_DISABLE_HTTP (void)data; @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> @@ -74,61 +74,61 @@ void idn_free (void *ptr); int curl_win32_idn_to_ascii(const char *in, char **out); #endif /* USE_LIBIDN */ -#include "urldata.h" -#include "netrc.h" - -#include "formdata.h" -#include "sslgen.h" -#include "hostip.h" -#include "transfer.h" -#include "sendf.h" -#include "progress.h" -#include "cookie.h" -#include "strequal.h" -#include "strerror.h" -#include "escape.h" -#include "strtok.h" -#include "share.h" -#include "content_encoding.h" -#include "http_digest.h" -#include "http_negotiate.h" -#include "select.h" -#include "multiif.h" -#include "easyif.h" -#include "speedcheck.h" -#include "rawstr.h" -#include "warnless.h" -#include "non-ascii.h" -#include "inet_pton.h" +#include "curl_urldata.h" +#include "curl_netrc.h" + +#include "curl_formdata.h" +#include "curl_sslgen.h" +#include "curl_hostip.h" +#include "curl_transfer.h" +#include "curl_sendf.h" +#include "curl_progress.h" +#include "curl_cookie.h" +#include "curl_strequal.h" +#include "curl_strerror.h" +#include "curl_escape.h" +#include "curl_strtok.h" +#include "curl_share.h" +#include "curl_content_encoding.h" +#include "curl_http_digest.h" +#include "curl_http_negotiate.h" +#include "curl_select.h" +#include "curl_multiif.h" +#include "curl_easyif.h" +#include "curl_speedcheck.h" +#include "curl_rawstr.h" +#include "curl_warnless.h" +#include "curl_non-ascii.h" +#include "curl_inet_pton.h" /* And now for the protocols */ -#include "ftp.h" -#include "dict.h" -#include "telnet.h" -#include "tftp.h" -#include "http.h" -#include "file.h" +#include "curl_ftp.h" +#include "curl_dict.h" +#include "curl_telnet.h" +#include "curl_tftp.h" +#include "curl_http.h" +#include "curl_file.h" #include "curl_ldap.h" -#include "ssh.h" -#include "imap.h" -#include "url.h" -#include "connect.h" -#include "inet_ntop.h" +#include "curl_ssh.h" +#include "curl_imap.h" +#include "curl_url.h" +#include "curl_connect.h" +#include "curl_inet_ntop.h" #include "curl_ntlm.h" #include "curl_ntlm_wb.h" -#include "socks.h" +#include "curl_socks.h" #include "curl_rtmp.h" -#include "gopher.h" -#include "http_proxy.h" -#include "bundles.h" -#include "conncache.h" +#include "curl_gopher.h" +#include "curl_http_proxy.h" +#include "curl_bundles.h" +#include "curl_conncache.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" /* Local static prototypes */ static bool ConnectionKillOne(struct SessionHandle *data); @@ -508,7 +508,7 @@ CURLcode Curl_init_userdefined(struct UserDefined *set) /* Set the default size of the SSL session ID cache */ set->ssl.max_ssl_sessions = 5; - set->proxyport = CURL_DEFAULT_PROXY_PORT; /* from url.h */ + set->proxyport = CURL_DEFAULT_PROXY_PORT; /* from curl_url.h */ set->proxytype = CURLPROXY_HTTP; /* defaults to HTTP proxy */ set->httpauth = CURLAUTH_BASIC; /* defaults to basic */ set->proxyauth = CURLAUTH_BASIC; /* defaults to basic */ @@ -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..d5d1859c9 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 @@ -66,8 +66,8 @@ */ #define RESP_TIMEOUT (1800*1000) -#include "cookie.h" -#include "formdata.h" +#include "curl_cookie.h" +#include "curl_formdata.h" #ifdef USE_SSLEAY #ifdef USE_OPENSSL @@ -150,7 +150,7 @@ #include <netinet/in.h> #endif -#include "timeval.h" +#include "curl_timeval.h" #ifdef HAVE_ZLIB_H #include <zlib.h> /* for content-encoding */ @@ -162,20 +162,20 @@ #include <curl/curl.h> -#include "http_chunks.h" /* for the structs and enum stuff */ -#include "hostip.h" -#include "hash.h" -#include "splay.h" - -#include "imap.h" -#include "pop3.h" -#include "smtp.h" -#include "ftp.h" -#include "file.h" -#include "ssh.h" -#include "http.h" -#include "rtsp.h" -#include "wildcard.h" +#include "curl_http_chunks.h" /* for the structs and enum stuff */ +#include "curl_hostip.h" +#include "curl_hash.h" +#include "curl_splay.h" + +#include "curl_imap.h" +#include "curl_pop3.h" +#include "curl_smtp.h" +#include "curl_ftp.h" +#include "curl_file.h" +#include "curl_ssh.h" +#include "curl_http.h" +#include "curl_rtsp.h" +#include "curl_wildcard.h" #ifdef HAVE_GSSAPI # ifdef HAVE_GSSGNU @@ -1068,7 +1068,7 @@ struct Progress { bool callback; /* set when progress callback is used */ int width; /* screen width at download start */ - int flags; /* see progress.h */ + int flags; /* see curl_progress.h */ double timespent; diff --git a/lib/version.c b/lib/version.c index ef8353ae2..fe1f73660 100644 --- a/lib/version.c +++ b/lib/version.c @@ -20,11 +20,11 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include <curl/curl.h> -#include "urldata.h" -#include "sslgen.h" +#include "curl_urldata.h" +#include "curl_sslgen.h" #define _MPRINTF_REPLACE /* use the internal *printf() functions */ #include <curl/mprintf.h> diff --git a/lib/warnless.c b/lib/warnless.c index 9cc7be9d3..30cdbe6f0 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__) @@ -35,7 +35,7 @@ #define BUILDING_WARNLESS_C 1 -#include "warnless.h" +#include "curl_warnless.h" #define CURL_MASK_SCHAR 0x7F #define CURL_MASK_UCHAR 0xFF diff --git a/lib/wildcard.c b/lib/wildcard.c index 6f4c7380c..d6ba2b276 100644 --- a/lib/wildcard.c +++ b/lib/wildcard.c @@ -20,18 +20,18 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" -#include "wildcard.h" -#include "llist.h" -#include "fileinfo.h" +#include "curl_wildcard.h" +#include "curl_llist.h" +#include "curl_fileinfo.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" CURLcode Curl_wildcard_init(struct WildcardData *wc) { diff --git a/m4/curl-reentrant.m4 b/m4/curl-reentrant.m4 index 2e2d868d6..f48e2f87d 100644 --- a/m4/curl-reentrant.m4 +++ b/m4/curl-reentrant.m4 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -21,7 +21,7 @@ #*************************************************************************** # File version for 'aclocal' use. Keep it a single number. -# serial 8 +# serial 9 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/ccsidcurl.c b/packages/OS400/ccsidcurl.c index 1baff3951..4ef9acbf6 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -32,10 +32,10 @@ #pragma enum(int) #include "curl.h" -#include "mprintf.h" -#include "urldata.h" -#include "url.h" -#include "getinfo.h" +#include "curl_mprintf.h" +#include "curl_urldata.h" +#include "curl_url.h" +#include "curl_getinfo.h" #include "ccsidcurl.h" #include "os400sys.h" diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c index 5527ce720..61ae1e0f3 100644 --- a/packages/OS400/os400sys.c +++ b/packages/OS400/os400sys.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -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/mkhelp.pl b/src/mkhelp.pl index 444b669ba..df6822aae 100644 --- a/src/mkhelp.pl +++ b/src/mkhelp.pl @@ -140,7 +140,7 @@ HEAD if($c) { print <<HEAD #include <zlib.h> -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ static const unsigned char hugehelpgz[] = { /* This mumbo-jumbo is the huge help text compressed with gzip. Thanks to this operation, the size of this data shrunk from $gzip diff --git a/src/tool_binmode.c b/src/tool_binmode.c index 92033ac03..26b50ada2 100644 --- a/src/tool_binmode.c +++ b/src/tool_binmode.c @@ -33,7 +33,7 @@ #include "tool_binmode.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ void set_binmode(FILE *stream) { diff --git a/src/tool_bname.c b/src/tool_bname.c index 277830546..6a2a33165 100644 --- a/src/tool_bname.c +++ b/src/tool_bname.c @@ -23,7 +23,7 @@ #include "tool_bname.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ #ifndef HAVE_BASENAME diff --git a/src/tool_cb_dbg.c b/src/tool_cb_dbg.c index 1850ba0c6..321c66133 100644 --- a/src/tool_cb_dbg.c +++ b/src/tool_cb_dbg.c @@ -30,7 +30,7 @@ #include "tool_cb_dbg.h" #include "tool_util.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ static void dump(const char *timebuf, const char *text, FILE *stream, const unsigned char *ptr, size_t size, diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c index ef340f798..e6988184a 100644 --- a/src/tool_cb_hdr.c +++ b/src/tool_cb_hdr.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#include "rawstr.h" +#include "curl_rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -31,7 +31,7 @@ #include "tool_msgs.h" #include "tool_cb_hdr.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ static char *parse_filename(const char *ptr, size_t len); diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c index 7a701b692..1b8842f2a 100644 --- a/src/tool_cb_prg.c +++ b/src/tool_cb_prg.c @@ -28,7 +28,7 @@ #include "tool_cfgable.h" #include "tool_cb_prg.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ /* ** callback for CURLOPT_PROGRESSFUNCTION diff --git a/src/tool_cb_rea.c b/src/tool_cb_rea.c index 4565a15d6..88dfbe852 100644 --- a/src/tool_cb_rea.c +++ b/src/tool_cb_rea.c @@ -28,7 +28,7 @@ #include "tool_cfgable.h" #include "tool_cb_rea.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ /* ** callback for CURLOPT_READFUNCTION diff --git a/src/tool_cb_see.c b/src/tool_cb_see.c index 2f49e1d96..1e36f5962 100644 --- a/src/tool_cb_see.c +++ b/src/tool_cb_see.c @@ -28,7 +28,7 @@ #include "tool_cfgable.h" #include "tool_cb_see.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ /* OUR_MAX_SEEK_L has 'long' data type, OUR_MAX_SEEK_O has 'curl_off_t, both represent the same value. Maximum offset used here when we lseek diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c index d6688110a..a055b444e 100644 --- a/src/tool_cb_wrt.c +++ b/src/tool_cb_wrt.c @@ -29,7 +29,7 @@ #include "tool_msgs.h" #include "tool_cb_wrt.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ /* ** callback for CURLOPT_WRITEFUNCTION diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c index da11f4afe..6cd9d33e7 100644 --- a/src/tool_cfgable.c +++ b/src/tool_cfgable.c @@ -23,7 +23,7 @@ #include "tool_cfgable.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ void free_config_fields(struct Configurable *config) { diff --git a/src/tool_convert.c b/src/tool_convert.c index ecce036a0..2011db0e7 100644 --- a/src/tool_convert.c +++ b/src/tool_convert.c @@ -29,7 +29,7 @@ #include "tool_convert.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ #ifdef HAVE_ICONV diff --git a/src/tool_dirhie.c b/src/tool_dirhie.c index 4ba1c4375..39158edcd 100644 --- a/src/tool_dirhie.c +++ b/src/tool_dirhie.c @@ -33,7 +33,7 @@ #include "tool_dirhie.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ #ifdef NETWARE # ifndef __NOVELL_LIBC__ diff --git a/src/tool_doswin.c b/src/tool_doswin.c index 4fae91d32..5afff1ecf 100644 --- a/src/tool_doswin.c +++ b/src/tool_doswin.c @@ -35,7 +35,7 @@ #include "tool_bname.h" #include "tool_doswin.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ /* * Macros ALWAYS_TRUE and ALWAYS_FALSE are used to avoid compiler warnings. diff --git a/src/tool_easysrc.c b/src/tool_easysrc.c index 339dde563..6aaa4116a 100644 --- a/src/tool_easysrc.c +++ b/src/tool_easysrc.c @@ -31,7 +31,7 @@ #include "tool_easysrc.h" #include "tool_msgs.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ /* global variable definitions, for easy-interface source code generation */ diff --git a/src/tool_formparse.c b/src/tool_formparse.c index 12b1a9d46..76a5db1fc 100644 --- a/src/tool_formparse.c +++ b/src/tool_formparse.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#include "rawstr.h" +#include "curl_rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -32,7 +32,7 @@ #include "tool_msgs.h" #include "tool_formparse.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ /*************************************************************************** * diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 297b986f5..9938e24ec 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#include "rawstr.h" +#include "curl_rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -45,7 +45,7 @@ #include "tool_parsecfg.h" #include "tool_version.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ #ifdef MSDOS # define USE_WATT32 diff --git a/src/tool_getpass.c b/src/tool_getpass.c index 0ac7dcbe0..6a841d414 100644 --- a/src/tool_getpass.c +++ b/src/tool_getpass.c @@ -57,7 +57,7 @@ #include "tool_getpass.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ #ifdef __VMS /* VMS implementation */ diff --git a/src/tool_help.c b/src/tool_help.c index 124f6404d..682fee980 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -24,7 +24,7 @@ #include "tool_panykey.h" #include "tool_help.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ #ifdef MSDOS # define USE_WATT32 diff --git a/src/tool_helpers.c b/src/tool_helpers.c index ae8aaaf32..e37576464 100644 --- a/src/tool_helpers.c +++ b/src/tool_helpers.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#include "rawstr.h" +#include "curl_rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -32,7 +32,7 @@ #include "tool_getparam.h" #include "tool_helpers.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ /* ** Helper functions that are used from more tha one source file. diff --git a/src/tool_homedir.c b/src/tool_homedir.c index cb90095e5..a6e07928f 100644 --- a/src/tool_homedir.c +++ b/src/tool_homedir.c @@ -30,7 +30,7 @@ #include "tool_homedir.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ static char *GetEnv(const char *variable, char do_expand) { diff --git a/src/tool_libinfo.c b/src/tool_libinfo.c index 81b6680c8..c6013a761 100644 --- a/src/tool_libinfo.c +++ b/src/tool_libinfo.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#include "rawstr.h" +#include "curl_rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -29,7 +29,7 @@ #include "tool_libinfo.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ /* global variable definitions, for libcurl run-time info */ diff --git a/src/tool_main.c b/src/tool_main.c index 9c0a19f3f..dc6d8d75d 100644 --- a/src/tool_main.c +++ b/src/tool_main.c @@ -39,7 +39,7 @@ * the library level code from this client-side is ugly, but we do this * anyway for convenience. */ -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ #ifdef __VMS static int vms_show = 0; diff --git a/src/tool_metalink.c b/src/tool_metalink.c index f9e9869b2..ff5f19c3f 100644 --- a/src/tool_metalink.c +++ b/src/tool_metalink.c @@ -89,7 +89,7 @@ struct win32_crypto_hash { # error "Can't compile METALINK support without a crypto library." #endif -#include "rawstr.h" +#include "curl_rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -101,7 +101,7 @@ struct win32_crypto_hash { #include "tool_metalink.h" #include "tool_msgs.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ /* Copied from tool_getparam.c */ #define GetStr(str,val) do { \ diff --git a/src/tool_mfiles.c b/src/tool_mfiles.c index 3eda45f91..e0cebb109 100644 --- a/src/tool_mfiles.c +++ b/src/tool_mfiles.c @@ -23,7 +23,7 @@ #include "tool_mfiles.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ static void AppendNode(struct multi_files **first, struct multi_files **last, diff --git a/src/tool_msgs.c b/src/tool_msgs.c index 80fdf4e27..9c58afa9c 100644 --- a/src/tool_msgs.c +++ b/src/tool_msgs.c @@ -28,7 +28,7 @@ #include "tool_cfgable.h" #include "tool_msgs.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ #define WARN_PREFIX "Warning: " #define WARN_TEXTWIDTH (79 - (int)strlen(WARN_PREFIX)) diff --git a/src/tool_operate.c b/src/tool_operate.c index bcbce2000..aa488899e 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -39,7 +39,7 @@ # include <netinet/tcp.h> #endif -#include "rawstr.h" +#include "curl_rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -74,7 +74,7 @@ #include "tool_writeout.h" #include "tool_xattr.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ #define CURLseparator "--_curl_--" diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c index 9078b9564..4f8cdf0c0 100644 --- a/src/tool_operhlp.c +++ b/src/tool_operhlp.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#include "rawstr.h" +#include "curl_rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -37,7 +37,7 @@ # include "tool_metalink.h" #endif -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ /* * my_useragent: returns allocated string with default user agent diff --git a/src/tool_panykey.c b/src/tool_panykey.c index d8718e328..632cd34bd 100644 --- a/src/tool_panykey.c +++ b/src/tool_panykey.c @@ -33,7 +33,7 @@ #include "tool_panykey.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ void tool_pressanykey(void) { diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c index 5d6f8bbc5..fe2514dfb 100644 --- a/src/tool_paramhlp.c +++ b/src/tool_paramhlp.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "tool_setup.h" -#include "rawstr.h" +#include "curl_rawstr.h" #define ENABLE_CURLX_PRINTF /* use our own printf() functions */ @@ -34,7 +34,7 @@ #include "tool_msgs.h" #include "tool_paramhlp.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ struct getout *new_getout(struct Configurable *config) { diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c index 561dada11..21d9e90c5 100644 --- a/src/tool_parsecfg.c +++ b/src/tool_parsecfg.c @@ -32,7 +32,7 @@ #include "tool_msgs.h" #include "tool_parsecfg.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ #define CURLRC DOT_CHAR "curlrc" #define ISSEP(x) (((x) == '=') || ((x) == ':')) diff --git a/src/tool_setopt.c b/src/tool_setopt.c index 9aefc21d5..08c1af5cb 100644 --- a/src/tool_setopt.c +++ b/src/tool_setopt.c @@ -31,7 +31,7 @@ #include "tool_easysrc.h" #include "tool_setopt.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ /* Lookup tables for converting setopt values back to symbols */ /* For enums, values may be in any order. */ diff --git a/src/tool_setup.h b/src/tool_setup.h index ed3849ba3..d3dab5c0b 100644 --- a/src/tool_setup.h +++ b/src/tool_setup.h @@ -25,15 +25,15 @@ #define CURL_NO_OLDIES /* - * setup.h may define preprocessor macros such as _FILE_OFFSET_BITS and + * curl_setup.h may define preprocessor macros such as _FILE_OFFSET_BITS and * _LARGE_FILES in order to support files larger than 2 GB. On platforms * where this happens it is mandatory that these macros are defined before * any system header file is included, otherwise file handling function * prototypes will be misdeclared and curl tool may not build properly; - * therefore we must include setup.h before curl.h when building curl. + * therefore we must include curl_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. @@ -67,7 +67,7 @@ #endif #ifndef HAVE_STRDUP -# include "strdup.h" +# include "curl_strdup.h" # define strdup(ptr) curlx_strdup(ptr) #endif diff --git a/src/tool_sleep.c b/src/tool_sleep.c index 49cdc71b8..e37cde4a5 100644 --- a/src/tool_sleep.c +++ b/src/tool_sleep.c @@ -37,7 +37,7 @@ #include "tool_sleep.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ void tool_go_sleep(long ms) { diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c index 2821d008d..663370a51 100644 --- a/src/tool_urlglob.c +++ b/src/tool_urlglob.c @@ -27,7 +27,7 @@ #include "tool_urlglob.h" #include "tool_vms.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ typedef enum { GLOB_OK, diff --git a/src/tool_util.c b/src/tool_util.c index 00d205ebc..0a0fa6960 100644 --- a/src/tool_util.c +++ b/src/tool_util.c @@ -23,7 +23,7 @@ #include "tool_util.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ #if defined(WIN32) && !defined(MSDOS) diff --git a/src/tool_vms.c b/src/tool_vms.c index 4a6a6f58e..abb5d1a04 100644 --- a/src/tool_vms.c +++ b/src/tool_vms.c @@ -34,7 +34,7 @@ #include "curlmsg_vms.h" #include "tool_vms.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ void decc$__posix_exit(int __status); void decc$exit(int __status); diff --git a/src/tool_writeenv.c b/src/tool_writeenv.c index a9462d004..918a8009d 100644 --- a/src/tool_writeenv.c +++ b/src/tool_writeenv.c @@ -32,7 +32,7 @@ #include "tool_writeenv.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ static const struct { diff --git a/src/tool_writeout.c b/src/tool_writeout.c index 6038a210a..bbb23af00 100644 --- a/src/tool_writeout.c +++ b/src/tool_writeout.c @@ -27,7 +27,7 @@ #include "tool_cfgable.h" #include "tool_writeout.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ typedef enum { VAR_NONE, /* must be the first */ diff --git a/src/tool_xattr.c b/src/tool_xattr.c index 505bdb17a..cc74c9da2 100644 --- a/src/tool_xattr.c +++ b/src/tool_xattr.c @@ -27,7 +27,7 @@ #include "tool_xattr.h" -#include "memdebug.h" /* keep this as LAST include */ +#include "curl_memdebug.h" /* keep this as LAST include */ #ifdef HAVE_FSETXATTR diff --git a/src/vc6curlsrc.dsp b/src/vc6curlsrc.dsp index 5fb7fe1d1..cc0e8c3b6 100644 --- a/src/vc6curlsrc.dsp +++ b/src/vc6curlsrc.dsp @@ -311,15 +311,15 @@ SOURCE=".\config-win32.h" # End Source File
# Begin Source File
-SOURCE=..\lib\nonblock.h
+SOURCE=..\lib\curl_nonblock.h
# End Source File
# Begin Source File
-SOURCE=..\lib\rawstr.h
+SOURCE=..\lib\curl_rawstr.h
# End Source File
# Begin Source File
-SOURCE=..\lib\strtoofft.h
+SOURCE=..\lib\curl_strtoofft.h
# End Source File
# Begin Source File
diff --git a/tests/convsrctest.pl b/tests/convsrctest.pl index ee442394c..6c0047ef6 100755 --- a/tests/convsrctest.pl +++ b/tests/convsrctest.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -45,7 +45,7 @@ require "getpart.pm"; # Boilerplate code for test tool my $head = '#include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { 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.inc b/tests/libtest/Makefile.inc index b9789f88f..0c45fea73 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -5,7 +5,7 @@ TESTUTIL = testutil.c testutil.h TSTTRACE = testtrace.c testtrace.h # files used only in some libcurl test programs -WARNLESS = $(top_srcdir)/lib/warnless.c $(top_srcdir)/lib/warnless.h +WARNLESS = $(top_srcdir)/lib/warnless.c $(top_srcdir)/lib/curl_warnless.h # these files are used in every single test program below SUPPORTFILES = first.c test.h 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/first.c b/tests/libtest/first.c index 253acb21d..4533548cd 100644 --- a/tests/libtest/first.c +++ b/tests/libtest/first.c @@ -27,7 +27,7 @@ #ifdef CURLDEBUG # define MEMDEBUG_NODEFINES -# include "memdebug.h" +# include "curl_memdebug.h" #endif int select_wrapper(int nfds, fd_set *rd, fd_set *wr, fd_set *exc, diff --git a/tests/libtest/lib1500.c b/tests/libtest/lib1500.c index 784bdb2a2..3659d55c9 100644 --- a/tests/libtest/lib1500.c +++ b/tests/libtest/lib1500.c @@ -22,8 +22,8 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib1501.c b/tests/libtest/lib1501.c index 01a382e82..b78f94df5 100644 --- a/tests/libtest/lib1501.c +++ b/tests/libtest/lib1501.c @@ -24,8 +24,8 @@ #include <fcntl.h> #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 30 * 1000 diff --git a/tests/libtest/lib1502.c b/tests/libtest/lib1502.c index 2b50c4733..2368eec45 100644 --- a/tests/libtest/lib1502.c +++ b/tests/libtest/lib1502.c @@ -34,8 +34,8 @@ #endif #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib500.c b/tests/libtest/lib500.c index dda1d7f42..e782d1a3e 100644 --- a/tests/libtest/lib500.c +++ b/tests/libtest/lib500.c @@ -22,7 +22,7 @@ #include "test.h" #include "testtrace.h" -#include "memdebug.h" +#include "curl_memdebug.h" #ifdef LIB585 diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c index 26275f977..9e5d06875 100644 --- a/tests/libtest/lib501.c +++ b/tests/libtest/lib501.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c index 554583ae2..f2adf274e 100644 --- a/tests/libtest/lib502.c +++ b/tests/libtest/lib502.c @@ -22,8 +22,8 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c index 50277f7d3..195149329 100644 --- a/tests/libtest/lib503.c +++ b/tests/libtest/lib503.c @@ -22,8 +22,8 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c index 358fc98dc..1e2584f3a 100644 --- a/tests/libtest/lib504.c +++ b/tests/libtest/lib504.c @@ -22,8 +22,8 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib505.c b/tests/libtest/lib505.c index 99b3a0afe..6ff4e8478 100644 --- a/tests/libtest/lib505.c +++ b/tests/libtest/lib505.c @@ -25,7 +25,7 @@ #include <fcntl.h> #endif -#include "memdebug.h" +#include "curl_memdebug.h" /* * This example shows an FTP upload, with a rename of the file just after diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c index 4477eaa50..0b4645670 100644 --- a/tests/libtest/lib506.c +++ b/tests/libtest/lib506.c @@ -23,7 +23,7 @@ #include <curl/mprintf.h> -#include "memdebug.h" +#include "curl_memdebug.h" static const char *HOSTHEADER = "Host: www.host.foo.com"; static const char *JAR = "log/jar506"; diff --git a/tests/libtest/lib507.c b/tests/libtest/lib507.c index 87c21defb..a27bf99f1 100644 --- a/tests/libtest/lib507.c +++ b/tests/libtest/lib507.c @@ -22,8 +22,8 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib508.c b/tests/libtest/lib508.c index 1aca064e9..c8fada3de 100644 --- a/tests/libtest/lib508.c +++ b/tests/libtest/lib508.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" static char data[]="this is what we post to the silly web server\n"; diff --git a/tests/libtest/lib510.c b/tests/libtest/lib510.c index 8278631c1..0ec8b1e58 100644 --- a/tests/libtest/lib510.c +++ b/tests/libtest/lib510.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" static const char *post[]={ "one", diff --git a/tests/libtest/lib511.c b/tests/libtest/lib511.c index 6be2d2f76..f90804b2a 100644 --- a/tests/libtest/lib511.c +++ b/tests/libtest/lib511.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib512.c b/tests/libtest/lib512.c index 19da18b4f..364744481 100644 --- a/tests/libtest/lib512.c +++ b/tests/libtest/lib512.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" /* Test case code based on source in a bug report filed by James Bursa on 28 Apr 2004 */ diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c index c013ac258..efec49b0a 100644 --- a/tests/libtest/lib513.c +++ b/tests/libtest/lib513.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) { diff --git a/tests/libtest/lib514.c b/tests/libtest/lib514.c index 953e90dff..7e0066ce5 100644 --- a/tests/libtest/lib514.c +++ b/tests/libtest/lib514.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib515.c b/tests/libtest/lib515.c index 4e96c4a8d..e403840de 100644 --- a/tests/libtest/lib515.c +++ b/tests/libtest/lib515.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib516.c b/tests/libtest/lib516.c index a9590948d..96ee44114 100644 --- a/tests/libtest/lib516.c +++ b/tests/libtest/lib516.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib517.c b/tests/libtest/lib517.c index ba49ec41e..e728acfa2 100644 --- a/tests/libtest/lib517.c +++ b/tests/libtest/lib517.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" static const char * const dates[]={ "Sun, 06 Nov 1994 08:49:37 GMT", diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c index 23f7f17c6..b6b1e1d7c 100644 --- a/tests/libtest/lib518.c +++ b/tests/libtest/lib518.c @@ -31,8 +31,8 @@ #include <limits.h> #endif -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #ifndef FD_SETSIZE #error "this test requires FD_SETSIZE" diff --git a/tests/libtest/lib519.c b/tests/libtest/lib519.c index b720c8fee..43efc1753 100644 --- a/tests/libtest/lib519.c +++ b/tests/libtest/lib519.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib520.c b/tests/libtest/lib520.c index 9ffaa4f92..6d70411c4 100644 --- a/tests/libtest/lib520.c +++ b/tests/libtest/lib520.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib521.c b/tests/libtest/lib521.c index 93c306864..57d938b99 100644 --- a/tests/libtest/lib521.c +++ b/tests/libtest/lib521.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib523.c b/tests/libtest/lib523.c index 0fdc83db6..e7004e20f 100644 --- a/tests/libtest/lib523.c +++ b/tests/libtest/lib523.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib524.c b/tests/libtest/lib524.c index 6f56df9b0..45aee7fb8 100644 --- a/tests/libtest/lib524.c +++ b/tests/libtest/lib524.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c index ca128cb9c..ce7d559d4 100644 --- a/tests/libtest/lib525.c +++ b/tests/libtest/lib525.c @@ -24,8 +24,8 @@ #include <fcntl.h> #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c index 9db04dba7..a89442684 100644 --- a/tests/libtest/lib526.c +++ b/tests/libtest/lib526.c @@ -43,8 +43,8 @@ #include <fcntl.h> #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c index ad84ff8a5..ba933b335 100644 --- a/tests/libtest/lib530.c +++ b/tests/libtest/lib530.c @@ -22,8 +22,8 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c index fdc18a1eb..6b2671b51 100644 --- a/tests/libtest/lib533.c +++ b/tests/libtest/lib533.c @@ -26,8 +26,8 @@ #include <fcntl.h> #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib536.c b/tests/libtest/lib536.c index e3ae402b7..1f7a798d1 100644 --- a/tests/libtest/lib536.c +++ b/tests/libtest/lib536.c @@ -24,8 +24,8 @@ #include <fcntl.h> #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c index 24d252235..2d55d480d 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -31,8 +31,8 @@ #include <limits.h> #endif -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #if !defined(HAVE_POLL_FINE) && \ !defined(USE_WINSOCK) && \ diff --git a/tests/libtest/lib539.c b/tests/libtest/lib539.c index 923893fb2..2e6396a13 100644 --- a/tests/libtest/lib539.c +++ b/tests/libtest/lib539.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib540.c b/tests/libtest/lib540.c index ac0ebe60b..a36693de3 100644 --- a/tests/libtest/lib540.c +++ b/tests/libtest/lib540.c @@ -35,8 +35,8 @@ #endif #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib541.c b/tests/libtest/lib541.c index 5fe8dd8ad..22388bdab 100644 --- a/tests/libtest/lib541.c +++ b/tests/libtest/lib541.c @@ -25,7 +25,7 @@ #include <fcntl.h> #endif -#include "memdebug.h" +#include "curl_memdebug.h" /* * Two FTP uploads, the second with no content sent. diff --git a/tests/libtest/lib542.c b/tests/libtest/lib542.c index 84f493f3e..a5cb3e204 100644 --- a/tests/libtest/lib542.c +++ b/tests/libtest/lib542.c @@ -25,7 +25,7 @@ #include <fcntl.h> #endif -#include "memdebug.h" +#include "curl_memdebug.h" /* * FTP get with NOBODY but no HEADER diff --git a/tests/libtest/lib543.c b/tests/libtest/lib543.c index b4a31ca9a..35e32e6f4 100644 --- a/tests/libtest/lib543.c +++ b/tests/libtest/lib543.c @@ -23,7 +23,7 @@ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib544.c b/tests/libtest/lib544.c index b766187f2..adb0345fb 100644 --- a/tests/libtest/lib544.c +++ b/tests/libtest/lib544.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" static char teststring[] = #ifdef CURL_DOES_CONVERSIONS diff --git a/tests/libtest/lib547.c b/tests/libtest/lib547.c index c82bc3f23..58d10824d 100644 --- a/tests/libtest/lib547.c +++ b/tests/libtest/lib547.c @@ -26,7 +26,7 @@ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" #ifdef CURL_DOES_CONVERSIONS /* ASCII representation with escape sequences for non-ASCII platforms */ diff --git a/tests/libtest/lib549.c b/tests/libtest/lib549.c index a1568c88f..8856ef174 100644 --- a/tests/libtest/lib549.c +++ b/tests/libtest/lib549.c @@ -26,7 +26,7 @@ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c index 2cc942ad4..1d3278fa8 100644 --- a/tests/libtest/lib552.c +++ b/tests/libtest/lib552.c @@ -25,8 +25,8 @@ #include "test.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" struct data { char trace_ascii; /* 1 or 0 */ diff --git a/tests/libtest/lib553.c b/tests/libtest/lib553.c index cb1cefd5e..ce96cebbb 100644 --- a/tests/libtest/lib553.c +++ b/tests/libtest/lib553.c @@ -26,7 +26,7 @@ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" #define POSTLEN 40960 diff --git a/tests/libtest/lib554.c b/tests/libtest/lib554.c index 0596f3ef1..1c90b9b0b 100644 --- a/tests/libtest/lib554.c +++ b/tests/libtest/lib554.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" static char data[]= #ifdef CURL_DOES_CONVERSIONS diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c index 49a81bf57..3c4205179 100644 --- a/tests/libtest/lib555.c +++ b/tests/libtest/lib555.c @@ -30,8 +30,8 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c index 98062209f..1eb2e1562 100644 --- a/tests/libtest/lib556.c +++ b/tests/libtest/lib556.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" /* For Windows, mainly (may be moved in a config file?) */ #ifndef STDIN_FILENO diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c index dc3bcae86..721338867 100644 --- a/tests/libtest/lib557.c +++ b/tests/libtest/lib557.c @@ -29,7 +29,7 @@ #include <curl/mprintf.h> -#include "memdebug.h" +#include "curl_memdebug.h" #if (CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG) diff --git a/tests/libtest/lib560.c b/tests/libtest/lib560.c index e8be1c7bd..90c07323b 100644 --- a/tests/libtest/lib560.c +++ b/tests/libtest/lib560.c @@ -22,8 +22,8 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib562.c b/tests/libtest/lib562.c index a5f0ea534..b00bd83d1 100644 --- a/tests/libtest/lib562.c +++ b/tests/libtest/lib562.c @@ -25,7 +25,7 @@ #include <fcntl.h> #endif -#include "memdebug.h" +#include "curl_memdebug.h" /* * From "KNOWN_BUGS" April 2009: diff --git a/tests/libtest/lib564.c b/tests/libtest/lib564.c index ed00e1bf6..84d0a20b6 100644 --- a/tests/libtest/lib564.c +++ b/tests/libtest/lib564.c @@ -24,8 +24,8 @@ #include <fcntl.h> #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib566.c b/tests/libtest/lib566.c index ba839d65f..f95872c5a 100644 --- a/tests/libtest/lib566.c +++ b/tests/libtest/lib566.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib567.c b/tests/libtest/lib567.c index 573529cd8..8b698394e 100644 --- a/tests/libtest/lib567.c +++ b/tests/libtest/lib567.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" /* * Test a simple OPTIONS request with a custom header diff --git a/tests/libtest/lib568.c b/tests/libtest/lib568.c index 4b15821f2..3e69a68f0 100644 --- a/tests/libtest/lib568.c +++ b/tests/libtest/lib568.c @@ -30,7 +30,7 @@ #include <curl/mprintf.h> -#include "memdebug.h" +#include "curl_memdebug.h" /* build request url */ static char *suburl(const char *base, int i) diff --git a/tests/libtest/lib569.c b/tests/libtest/lib569.c index a434d7459..c7635f19a 100644 --- a/tests/libtest/lib569.c +++ b/tests/libtest/lib569.c @@ -23,7 +23,7 @@ #include <curl/mprintf.h> -#include "memdebug.h" +#include "curl_memdebug.h" /* build request url */ static char *suburl(const char *base, int i) diff --git a/tests/libtest/lib570.c b/tests/libtest/lib570.c index a9fac9915..b9a105f08 100644 --- a/tests/libtest/lib570.c +++ b/tests/libtest/lib570.c @@ -23,7 +23,7 @@ #include <curl/mprintf.h> -#include "memdebug.h" +#include "curl_memdebug.h" /* build request url */ static char *suburl(const char *base, int i) diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c index ba0aa1ce4..977c7723e 100644 --- a/tests/libtest/lib571.c +++ b/tests/libtest/lib571.c @@ -39,8 +39,8 @@ #include <curl/mprintf.h> -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define RTP_PKT_CHANNEL(p) ((int)((unsigned char)((p)[1]))) diff --git a/tests/libtest/lib572.c b/tests/libtest/lib572.c index 3df4d036a..78e5c804c 100644 --- a/tests/libtest/lib572.c +++ b/tests/libtest/lib572.c @@ -30,7 +30,7 @@ #include <curl/mprintf.h> -#include "memdebug.h" +#include "curl_memdebug.h" /* build request url */ static char *suburl(const char *base, int i) diff --git a/tests/libtest/lib573.c b/tests/libtest/lib573.c index b49d26a5d..34fdb99bd 100644 --- a/tests/libtest/lib573.c +++ b/tests/libtest/lib573.c @@ -23,8 +23,8 @@ #include "testtrace.h" #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib574.c b/tests/libtest/lib574.c index afb2bceae..4f77ae394 100644 --- a/tests/libtest/lib574.c +++ b/tests/libtest/lib574.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" static int new_fnmatch(const char *pattern, const char *string) { diff --git a/tests/libtest/lib575.c b/tests/libtest/lib575.c index 942df68c5..74d098ee1 100644 --- a/tests/libtest/lib575.c +++ b/tests/libtest/lib575.c @@ -24,8 +24,8 @@ #include <fcntl.h> #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib576.c b/tests/libtest/lib576.c index 61bb61325..7ee86c68c 100644 --- a/tests/libtest/lib576.c +++ b/tests/libtest/lib576.c @@ -22,7 +22,7 @@ #include "test.h" #include "testutil.h" -#include "memdebug.h" +#include "curl_memdebug.h" typedef struct { int remains; diff --git a/tests/libtest/lib578.c b/tests/libtest/lib578.c index a39b31772..eee42663b 100644 --- a/tests/libtest/lib578.c +++ b/tests/libtest/lib578.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" /* The size of data should be kept below MAX_INITIAL_POST_SIZE! */ static char data[]="this is a short string.\n"; diff --git a/tests/libtest/lib579.c b/tests/libtest/lib579.c index c5cf603bb..e6c0e6f6e 100644 --- a/tests/libtest/lib579.c +++ b/tests/libtest/lib579.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" static const char * const post[]={ "one", diff --git a/tests/libtest/lib582.c b/tests/libtest/lib582.c index 952efb4ed..bd88e43aa 100644 --- a/tests/libtest/lib582.c +++ b/tests/libtest/lib582.c @@ -24,8 +24,8 @@ #include <fcntl.h> #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib583.c b/tests/libtest/lib583.c index ad5a5cea7..4ef9e5a35 100644 --- a/tests/libtest/lib583.c +++ b/tests/libtest/lib583.c @@ -28,7 +28,7 @@ #include <sys/stat.h> -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib586.c b/tests/libtest/lib586.c index 2cf04fe85..34f093967 100644 --- a/tests/libtest/lib586.c +++ b/tests/libtest/lib586.c @@ -23,7 +23,7 @@ #include <curl/mprintf.h> -#include "memdebug.h" +#include "curl_memdebug.h" #define THREADS 2 diff --git a/tests/libtest/lib590.c b/tests/libtest/lib590.c index 68603c65e..26e88731c 100644 --- a/tests/libtest/lib590.c +++ b/tests/libtest/lib590.c @@ -34,7 +34,7 @@ - Start the request */ -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib591.c b/tests/libtest/lib591.c index 5cd4644e3..48648fb24 100644 --- a/tests/libtest/lib591.c +++ b/tests/libtest/lib591.c @@ -30,8 +30,8 @@ #include <fcntl.h> #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib597.c b/tests/libtest/lib597.c index a27cefd5b..aae6500ae 100644 --- a/tests/libtest/lib597.c +++ b/tests/libtest/lib597.c @@ -26,8 +26,8 @@ #endif #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 5 * 1000 diff --git a/tests/libtest/lib598.c b/tests/libtest/lib598.c index e9c1ad776..53fabd168 100644 --- a/tests/libtest/lib598.c +++ b/tests/libtest/lib598.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib599.c b/tests/libtest/lib599.c index 6b092677a..6de586932 100644 --- a/tests/libtest/lib599.c +++ b/tests/libtest/lib599.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "test.h" -#include "memdebug.h" +#include "curl_memdebug.h" static int progress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) diff --git a/tests/libtest/libauthretry.c b/tests/libtest/libauthretry.c index 95761325a..c5cc6cfd8 100644 --- a/tests/libtest/libauthretry.c +++ b/tests/libtest/libauthretry.c @@ -25,8 +25,8 @@ */ #include "test.h" -#include "strequal.h" -#include "memdebug.h" +#include "curl_strequal.h" +#include "curl_memdebug.h" static CURLcode send_request(CURL *curl, const char *url, int seq, long auth_scheme, const char *userpwd) diff --git a/tests/libtest/libntlmconnect.c b/tests/libtest/libntlmconnect.c index b540ebf58..c7cc93350 100644 --- a/tests/libtest/libntlmconnect.c +++ b/tests/libtest/libntlmconnect.c @@ -27,8 +27,8 @@ #include <assert.h> #include "testutil.h" -#include "warnless.h" -#include "memdebug.h" +#include "curl_warnless.h" +#include "curl_memdebug.h" #define TEST_HANG_TIMEOUT 5 * 1000 #define MAX_EASY_HANDLES 3 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..b45e72112 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 - 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 */ +/* 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> @@ -37,7 +37,7 @@ #endif #ifdef TPF -# include "select.h" +# include "curl_select.h" #endif #define test_setopt(A,B,C) \ diff --git a/tests/libtest/testtrace.c b/tests/libtest/testtrace.c index c977d2105..0f74d8d9f 100644 --- a/tests/libtest/testtrace.c +++ b/tests/libtest/testtrace.c @@ -27,7 +27,7 @@ #include "testutil.h" #include "testtrace.h" -#include "memdebug.h" +#include "curl_memdebug.h" struct libtest_trace_cfg libtest_debug_config; diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c index 3ad18c987..456d799e7 100644 --- a/tests/libtest/testutil.c +++ b/tests/libtest/testutil.c @@ -19,10 +19,10 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include "testutil.h" -#include "memdebug.h" +#include "curl_memdebug.h" #if defined(WIN32) && !defined(MSDOS) 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/mem-include-scan.pl b/tests/mem-include-scan.pl index 676df25e9..8f599ae0a 100644 --- a/tests/mem-include-scan.pl +++ b/tests/mem-include-scan.pl @@ -46,7 +46,7 @@ sub scanfile { if($_ =~ /(free|alloc|strdup)\(/) { $memfunc++; } - elsif($_ =~ /^ *# *include \"memdebug.h\"/) { + elsif($_ =~ /^ *# *include \"curl_memdebug.h\"/) { $memdebug++; } elsif($_ =~ /^ *# *include \"curl_memory.h\"/) { @@ -70,7 +70,7 @@ sub scanfile { } else { if(!$memdebug) { - print STDERR "$file doesn't include \"memdebug.h\"!\n"; + print STDERR "$file doesn't include \"curl_memdebug.h\"!\n"; } if(!$curlmem) { print STDERR "$file doesn't include \"curl_memory.h\"!\n"; diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index 0401df215..2e82c1133 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) @@ -67,5 +67,5 @@ endforeach() # SETUP_EXECUTABLE(resolve resolve.c util.c util.h ${useful}) # SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/inet_pton.c) # SETUP_EXECUTABLE(getpart testpart.c ${useful}) -# SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} tftp.h) +# SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} server_tftp.h) diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc index 4a12ea872..2dbbf2660 100644 --- a/tests/server/Makefile.inc +++ b/tests/server/Makefile.inc @@ -10,11 +10,11 @@ CURLX_SRCS = \ CURLX_HDRS = \ $(top_srcdir)/lib/curlx.h \ - $(top_srcdir)/lib/nonblock.h \ - $(top_srcdir)/lib/strequal.h \ - $(top_srcdir)/lib/strtoofft.h \ - $(top_srcdir)/lib/timeval.h \ - $(top_srcdir)/lib/warnless.h + $(top_srcdir)/lib/curl_nonblock.h \ + $(top_srcdir)/lib/curl_strequal.h \ + $(top_srcdir)/lib/curl_strtoofft.h \ + $(top_srcdir)/lib/curl_timeval.h \ + $(top_srcdir)/lib/curl_warnless.h USEFUL = \ getpart.c \ @@ -23,7 +23,7 @@ USEFUL = \ $(top_srcdir)/lib/base64.c \ $(top_srcdir)/lib/curl_base64.h \ $(top_srcdir)/lib/memdebug.c \ - $(top_srcdir)/lib/memdebug.h + $(top_srcdir)/lib/curl_memdebug.h UTIL = \ util.c \ @@ -62,7 +62,7 @@ sws_CFLAGS = $(AM_CFLAGS) tftpd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \ server_sockaddr.h \ tftpd.c \ - tftp.h + server_tftp.h tftpd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@ tftpd_CFLAGS = $(AM_CFLAGS) diff --git a/tests/server/fake_ntlm.c b/tests/server/fake_ntlm.c index 64f0675e7..1c10e4812 100644 --- a/tests/server/fake_ntlm.c +++ b/tests/server/fake_ntlm.c @@ -34,8 +34,8 @@ #include "getpart.h" #include "util.h" -/* include memdebug.h last */ -#include "memdebug.h" +/* include curl_memdebug.h last */ +#include "curl_memdebug.h" #ifndef DEFAULT_LOGFILE #define DEFAULT_LOGFILE "log/fake_ntlm.log" diff --git a/tests/server/getpart.c b/tests/server/getpart.c index f37f88cba..56719f05b 100644 --- a/tests/server/getpart.c +++ b/tests/server/getpart.c @@ -36,8 +36,8 @@ struct SessionHandle { #include "curl_base64.h" #include "curl_memory.h" -/* include memdebug.h last */ -#include "memdebug.h" +/* include curl_memdebug.h last */ +#include "curl_memdebug.h" #define EAT_SPACE(p) while(*(p) && ISSPACE(*(p))) (p)++ diff --git a/tests/server/resolve.c b/tests/server/resolve.c index d0609888a..a094b4d70 100644 --- a/tests/server/resolve.c +++ b/tests/server/resolve.c @@ -51,8 +51,8 @@ #include "curlx.h" /* from the private lib dir */ #include "util.h" -/* include memdebug.h last */ -#include "memdebug.h" +/* include curl_memdebug.h last */ +#include "curl_memdebug.h" static bool use_ipv6 = FALSE; static const char *ipv_inuse = "IPv4"; @@ -136,7 +136,7 @@ int main(int argc, char *argv[]) hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_CANONNAME; /* Use parenthesis around function to stop it from being replaced by - the macro in memdebug.h */ + the macro in curl_memdebug.h */ rc = (getaddrinfo)(host, "80", &hints, &ai); } diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 3c55eff35..65f84e6e1 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -51,8 +51,8 @@ #include "util.h" #include "server_sockaddr.h" -/* include memdebug.h last */ -#include "memdebug.h" +/* include curl_memdebug.h last */ +#include "curl_memdebug.h" #ifdef ENABLE_IPV6 static bool use_ipv6 = FALSE; diff --git a/tests/server/server_setup.h b/tests/server/server_setup.h index 193ad84d7..d3efc93eb 100644 --- a/tests/server/server_setup.h +++ b/tests/server/server_setup.h @@ -24,6 +24,7 @@ #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/server/tftp.h b/tests/server/server_tftp.h index 0650efe6a..0650efe6a 100644 --- a/tests/server/tftp.h +++ b/tests/server/server_tftp.h diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 93d0b5d14..394449ca9 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -98,12 +98,12 @@ versions instead */ #include "curlx.h" /* from the private lib dir */ #include "getpart.h" -#include "inet_pton.h" +#include "curl_inet_pton.h" #include "util.h" #include "server_sockaddr.h" -/* include memdebug.h last */ -#include "memdebug.h" +/* include curl_memdebug.h last */ +#include "curl_memdebug.h" #define DEFAULT_PORT 8999 diff --git a/tests/server/sws.c b/tests/server/sws.c index 44d899fd7..3afbe3e83 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -49,12 +49,12 @@ versions instead */ #include "curlx.h" /* from the private lib dir */ #include "getpart.h" -#include "inet_pton.h" +#include "curl_inet_pton.h" #include "util.h" #include "server_sockaddr.h" -/* include memdebug.h last */ -#include "memdebug.h" +/* include curl_memdebug.h last */ +#include "curl_memdebug.h" #ifdef ENABLE_IPV6 static bool use_ipv6 = FALSE; diff --git a/tests/server/testpart.c b/tests/server/testpart.c index 912096f0b..255bbe8d3 100644 --- a/tests/server/testpart.c +++ b/tests/server/testpart.c @@ -26,8 +26,8 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -/* include memdebug.h last */ -#include "memdebug.h" +/* include curl_memdebug.h last */ +#include "curl_memdebug.h" int main(int argc, char **argv) { diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index e8c3c2d82..c1033a5c0 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -67,7 +67,7 @@ #ifdef HAVE_ARPA_TFTP_H #include <arpa/tftp.h> #else -#include "tftp.h" +#include "server_tftp.h" #endif #ifdef HAVE_NETDB_H #include <netdb.h> @@ -91,8 +91,8 @@ #include "util.h" #include "server_sockaddr.h" -/* include memdebug.h last */ -#include "memdebug.h" +/* include curl_memdebug.h last */ +#include "curl_memdebug.h" /***************************************************************************** * STRUCT DECLARATIONS AND DEFINES * diff --git a/tests/server/util.c b/tests/server/util.c index 30766d80f..ef3c8f6a3 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -46,7 +46,7 @@ #include "curlx.h" /* from the private lib dir */ #include "getpart.h" #include "util.h" -#include "timeval.h" +#include "curl_timeval.h" #if defined(ENABLE_IPV6) && defined(__MINGW32__) const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }}; diff --git a/tests/unit/unit1300.c b/tests/unit/unit1300.c index 2b8341683..ba27e4ecc 100644 --- a/tests/unit/unit1300.c +++ b/tests/unit/unit1300.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curlcheck.h" -#include "llist.h" +#include "curl_llist.h" static struct curl_llist *llist; diff --git a/tests/unit/unit1301.c b/tests/unit/unit1301.c index 47df481a8..5baf4d5c0 100644 --- a/tests/unit/unit1301.c +++ b/tests/unit/unit1301.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curlcheck.h" -#include "strequal.h" +#include "curl_strequal.h" static CURLcode unit_setup( void ) {return CURLE_OK;} static void unit_stop( void ) {} diff --git a/tests/unit/unit1302.c b/tests/unit/unit1302.c index fc50c8865..e431fffca 100644 --- a/tests/unit/unit1302.c +++ b/tests/unit/unit1302.c @@ -21,10 +21,10 @@ ***************************************************************************/ #include "curlcheck.h" -#include "urldata.h" -#include "url.h" /* for Curl_safefree */ +#include "curl_urldata.h" +#include "curl_url.h" #include "curl_base64.h" -#include "memdebug.h" /* LAST include file */ +#include "curl_memdebug.h" /* LAST include file */ static struct SessionHandle *data; diff --git a/tests/unit/unit1303.c b/tests/unit/unit1303.c index 2e4f23096..7e9dbc158 100644 --- a/tests/unit/unit1303.c +++ b/tests/unit/unit1303.c @@ -21,9 +21,9 @@ ***************************************************************************/ #include "curlcheck.h" -#include "urldata.h" -#include "connect.h" -#include "memdebug.h" /* LAST include file */ +#include "curl_urldata.h" +#include "curl_connect.h" +#include "curl_memdebug.h" /* LAST include file */ static struct SessionHandle *data; diff --git a/tests/unit/unit1304.c b/tests/unit/unit1304.c index 8ddd8caee..3ebd89cbd 100644 --- a/tests/unit/unit1304.c +++ b/tests/unit/unit1304.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curlcheck.h" -#include "netrc.h" +#include "curl_netrc.h" static char login[LOGINSIZE]; static char password[PASSWORDSIZE]; diff --git a/tests/unit/unit1305.c b/tests/unit/unit1305.c index 5900c6dd5..a4b431114 100644 --- a/tests/unit/unit1305.c +++ b/tests/unit/unit1305.c @@ -34,11 +34,11 @@ #define ENABLE_CURLX_PRINTF #include "curlx.h" -#include "hash.h" -#include "hostip.h" +#include "curl_hash.h" +#include "curl_hostip.h" #include "curl_memory.h" -#include "memdebug.h" /* LAST include file */ +#include "curl_memdebug.h" /* LAST include file */ static struct SessionHandle *data; static struct curl_hash *hp; diff --git a/tests/unit/unit1309.c b/tests/unit/unit1309.c index 1304ba18e..4a741a19d 100644 --- a/tests/unit/unit1309.c +++ b/tests/unit/unit1309.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curlcheck.h" -#include "splay.h" +#include "curl_splay.h" static CURLcode unit_setup(void) |