diff --git a/buildconf b/buildconf index a7eb51a121d5563b511c2614333b6c17aee1ded8..88b64efeae43327b7e351acb247b81208512df54 100755 --- a/buildconf +++ b/buildconf @@ -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 ff48c5bc4f66f3027c32507f37561b27ccdad089..5853e5766565a6b87ffc5b6ba0b21d469dc175a3 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,7 @@ AC_COPYRIGHT([Copyright (c) 1998 - 2012 Daniel Stenberg, 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 eac3cd555b27887a1c57d670571cd5e126764345..bb620466c85f7175375fa86db71d58d54a6264a9 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 4e9c88003d489049e868af7be6f8a7da289110c6..7c2ede35b63a7540acd042ce5c2b27a70c982d02 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 f97ef6d0ee24c7cecf31b7e54ac5be1c5bf5d335..115dd4487d88a507b7790e1b26bc9ec5ba70d9d8 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 9723b93fd8eefe183f124b935e7173f0a785065c..a87dab45a61e55d8331ef933801afa9367018de5 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 71ea704e17d3bca3fa3a37a420baae75f17a5cbb..c726abb68ba5a25766888a5b91d1c053697b0848 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 -#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 7476a13d8af47a6d3adadfa0c533f43c055f10a5..76578be868a68affdae17ebbc5f387b1370f6327 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 44d00bdb060653e4229b3f351324d491512c33b1..6e09e9b98907feb920b91f8335603eef9374b88c 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 @@ -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 @@ -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 0d29d58872fa1bdaffa2ef09054e1338fa519d6a..6d3667fab7879c1581a6302eabb8a59c826238a8 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 @@ -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 e7c1b886d91baf40c088980d4dec61efffc4ed64..1b681ea12243610684584c04f48ffa6f695b3490 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 19ed730919676bc993c171e81b16ddbea72d34b3..3a29cc2005b2bd625647483262b871e085613bc3 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 -#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 #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 8d33b1c7a73eeecae9685f01bc9728f57b21eba2..06f78ed3234520b668aca8e77afd71ab2976358a 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 ec46c09abbc49e009301fd7d6de6b081bf68d364..3b90ee17a0dec448915773a536e0e3afa8bce771 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 -#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 f09ee2a35db81b5a32352778bf23c26bae0de11e..efbaeee4f2c0b233d81880a39d1fa32e5fcb17c0 100644 --- a/lib/bundles.c +++ b/lib/bundles.c @@ -21,21 +21,21 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include -#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 a3a90f87982dae7cc922c9be7aa706aad6182209..bc95e07df083373765406f26348162e90afd6f06 100644 --- a/lib/conncache.c +++ b/lib/conncache.c @@ -21,22 +21,22 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include -#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 19f5b2f5bc1d1edc5984897bfaaa6e82a0e8d337..85226d80805766891b38a62b10a5ed3d37df9bdd 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 /* may need it */ @@ -59,24 +59,24 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include -#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 f84361f2e285331a14d436b7d5b38483796ce9a5..db23b928117a1fd25d3a27a55749e5aaa82fb57b 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 3276ef98886bb46979f80a2792be8decd6766295..6f4d1428ad8d467075574c1ad3719ef3e968ddea 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 -#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 372da4a3bbfee130914dc3ff9798cc5b1d9b7a61..501f6c8cebd4084a0d5907e655ea84dbfe0ee15e 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 644b33a2565700e3144b8f1341827767876e8245..90ee884bb0c567cca081d8ab5497e00afd4cb01d 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 -#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 5997e4680fad4b95b17228b13b35cf182b23734e..d3b63f780fce06e7cbbd57b86ee98f9394748935 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 diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c index 815b4ae6442182a19f3bd228c734d61d6f5df71b..6cf7076f6fd7e984979512bb5a7c7b3501471f75 100644 --- a/lib/curl_addrinfo.c +++ b/lib/curl_addrinfo.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include @@ -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 #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 a5375cb33d9f17be521410660d02d317166dbbe0..6d2b753eb3d317f8b9d61d1a06a3d60d296d0a47 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 diff --git a/lib/curl_darwinssl.c b/lib/curl_darwinssl.c index 2d56b39208c9c89a98177250e7924cd75ca725a3..04067d167760cd29d8c1d468d0760af30d18c15d 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 #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 53053edca8e99c1507ae3eac6a2ef9ffe1ccea79..183d9371c7399a767880de14b9f62b41d23a9260 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 e18f52eabee7a41700c6063857a17c79fa37e443..b6f7dd948c186995be3efc616e8a131e11372759 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 ddee4ba1db7d9e77ab6e8ea534b4e77b42a5da11..ded1e6f948d2482dc3e04643024ccfbad1864580 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 b9c8ad0cffe93ffacdecb3b297b0157cd8a097bc..2d2492ecb8b9c3039b85b3182e7169bfb3adb103 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 fd4596b80113ab07d83e9d9c3907fbf4ff283f5e..df4bcd6500fba03cd1f972baf5d8e69c3e2d97c9 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 6b6c16e134c5e6cd714ad83875e8348d2be7dd9d..b0be9cf6cf2883a6f63c097a579b2f09de52dd55 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 d79af9be7492f1af194daf603370e97577275e3b..ad7f1880d98cc9a68d9eeee2f0afb9ac838a9abf 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 37061b6082c92eafd0165839879c71bf366e7122..324c73a7b89fdda5aed0667b746069702a622395 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 7cb9e4c60c8e43486641d7afccfbdbab19c44db1..75d6544b0a048fb5625f6ec4d9832555532ac132 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 6ecccd3c93639347db2d6172b76ceef2e9aba046..7ee5eae1262fa82a23a2011d74fb7722486315e1 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 9c7837254922383fc9414068f90e495496942fae..470b9c62ac3f66ed54ed4595c719b8b23f418a57 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 #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 b2783778b36fb94924e7291bc7c1a3e2ef1c6dd3..21a9e9e47b4a580165a399ef44b8808b345de3bb 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 6b7d9fc466d1859ee4eca264323d9216259f88c4..ebd6e304b66036cd4a7351b24c08b0f3501b2e6b 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 /* 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 5615b3504473cf24895234c833e65a6d2a310284..9aa126bb266f688ca4d542c7c7ce7c201552896d 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 8e788d733f8ffd603887dead5de1defb612ad7b0..e625a06c41e0ad88b67294b40e4d7da34b088286 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 /* 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 703fb75e1c9f3995e118d2cf1f92e093af01fff5..e7d185dea50b77ce707feb5f5add956eceb6cbbb 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 46a51c2c45af54bfa76adb22f945cdc7cdc7d1e2..87ac6f48e6dc98e6f69291466266c4727e2385ef 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 #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 /* 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 e3eaffe176af7592143feca9d7f3f63895a99365..db6bc16b73c95f6a9616379c47d3484426edd0da 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 047b7f345f3b0f99df751ff3bc313fbda672e1ab..bfd5f1d535758c5db959fc305cac5ce71a7793bc 100644 --- a/lib/curl_rand.c +++ b/lib/curl_rand.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include @@ -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 b87bdf2c7f9a0d8ceded97943e6f868cdfa2a14b..b8caca0a0a7f224a74f14fd375d223a37823ce49 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 #include @@ -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 ccb54a89f50ee33f88ee32253329b625c5cff9b9..1becc28df2f9f7af525bcae63c528af91b51b5d1 100644 --- a/lib/curl_sasl.c +++ b/lib/curl_sasl.c @@ -24,10 +24,10 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include -#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 /* 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 469c9a1e44ecd456c8dcac1705319380542db7f1..fa8ac84ac1e27c360da3b4961f176b012803aa08 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 8cb3af80fa2964eda20c81c2c9f00aa976ffae65..3bbebec8aa215505fc12bcc24c6285f092109a5c 100644 --- a/lib/curl_schannel.c +++ b/lib/curl_schannel.c @@ -28,16 +28,6 @@ * */ -/* - * Based upon the PolarSSL implementation in polarssl.c and polarssl.h: - * Copyright (C) 2010, 2011, Hoi-Ho Chan, - * - * Based upon the CyaSSL implementation in cyassl.c and cyassl.h: - * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. - * - * Thanks for code and inspiration! - */ - /* * TODO list for TLS/SSL implementation: * - implement client certificate authentication @@ -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 #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 37126ac7d04d9b2ef66c43ae898907f86f859bd5..918670fe03c756a31c40c707bfa02f6fe91af411 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 c3c41ec2f7dd6409178ea884155f36bb25915374..40a0af1e4f95dd23aff0e3f67915c14d0b490a86 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 c3e6d9760ccdac03852dbd978a5c3d7a8245df90..d52582856428d257b6f59ab4dcef6ea0977df7ad 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 411ccc81d175182fbdee74712c70e705334ba418..8bbf0af98960585a35a02977b71f30ef6d48cac5 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 ba81054a25c6e076d6a258b26780f89cef50fa78..d9cec6b294197cd3fcae28931a8b0d472d07eb56 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 9dc90a004bd0871b14e83441a1beb40de8aaf3ff..42c62958d62b64fc839a2249b4c65e3d0bd604cf 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 13c0d135d95b17f36c2b50b2a8ba0789253e1fa9..a2f941ed1129c5091a09faafa104ca52232de639 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 #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 #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #include #include diff --git a/lib/cyassl.h b/lib/cyassl.h index 56d68066f99385d7c0071dbe983aad7f9ab2bc70..7728a0cf57a098905781d68613de214f24abb2f8 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 ca5c362b18ca9a1102740e2c3414f71b1e36f531..114ef7c72bf02f62c97f3608c60b1122e37d7dd0 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 #endif -#include "urldata.h" +#include "curl_urldata.h" #include -#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 #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 b73bf6601885adefd43e1503cd898e13ed1c1d50..b4f0390a9bba7f2c87ce6a9d9140cd455c66d09c 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 @@ -42,35 +42,35 @@ #include #endif -#include "strequal.h" -#include "urldata.h" +#include "curl_strequal.h" +#include "curl_urldata.h" #include -#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 /* 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 0dd5a1d0a687194492b2c38b54007de3e0775530..1d542618edbc093845f6eeba94752fc04fbf5ba6 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 #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 /* 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 886a09e2498754f2c484404f588afb50a1c51409..6ea2bd7698cf5bd78288ee13082b6e73119705cb 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 #endif -#include "strtoofft.h" -#include "urldata.h" +#include "curl_strtoofft.h" +#include "curl_urldata.h" #include -#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 /* 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 4ffcbbe2983eb774e93ee5620175c2b7c35cb25b..433c709b5b9f9787e0d44fc24421cce9b735e49a 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 #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 7bf8839414a826b3a96c6d4d232f396ee0d30f01..6b7166379ac30d30dcbb2f2148a87cb3b158d8fc 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include @@ -33,18 +33,18 @@ #include #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 /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #endif /* !defined(CURL_DISABLE_HTTP) || defined(USE_SSLEAY) */ diff --git a/lib/ftp.c b/lib/ftp.c index dc24d0bb5da45bad66ae4b90194a44ecd1b305e2..d9f933ffdabf591525d945af4e298c5658570d62 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_FTP @@ -47,47 +47,47 @@ #endif #include -#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 #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifndef NI_MAXHOST #define NI_MAXHOST 1025 diff --git a/lib/ftp.h b/lib/ftp.h index d359f28f35a8669537c13e7190470dbd8d2334d2..6b75ac96c2705b664104a58d3690741cb91ec7d6 100644 --- a/lib/ftp.h +++ b/lib/ftp.h @@ -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 49ee4b6a6e5009e11522d21f44d14930d7520070..a1a7d5187a198c6ed129280b3c749d4a3e4edbda 100644 --- a/lib/ftplistparser.c +++ b/lib/ftplistparser.c @@ -35,19 +35,19 @@ * 01-29-97 11:32PM prog */ -#include "setup.h" +#include "curl_setup.h" #ifndef CURL_DISABLE_FTP #include -#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 8499ccda4d394a14fc1fda97596c80c766d60860..96764e2a41a119ee1862a833d7a94793e3db49a5 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 a2d69830e19b247053d928d9a68c3690d3caab8d..cf8b0361958ec7f52569b615788c8ecfa477511c 100644 --- a/lib/getenv.c +++ b/lib/getenv.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef __VMS #include @@ -29,7 +29,7 @@ #include #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 221f05a4fab8256a6934894a53cf21e32f7e2c3e..0404c28ea4034400b38d106deee56aa8c86cadfe 100644 --- a/lib/getinfo.c +++ b/lib/getinfo.c @@ -20,20 +20,20 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include -#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 e8f2790fc485409d99d235c1de4dd58be8d6c07f..80fc18e8e4130644113803ff82120ed9de5200c5 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 -#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 #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 8c2a4a0c924d002d80a768bcf3874919ba904343..4e2254109c808efaad27c0786cda2ca249045f4f 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 #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 #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 45b755a0e18e33a420a7747dea35e27d96eef15e..83cfac7fd0b0c31e2520b4a7bcaede462d80ae63 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 b59e56146741ef2d277c57d0401c78602f6d7c11..732dbcf73a9f6da28604fd86c2e8681b582af946 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 #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 3fa621cb1d333c77d2c91a7ecc70787ea4408379..68e7933abaac274ed340a08f14cd1a7bf3d43f3f 100644 --- a/lib/hash.h +++ b/lib/hash.h @@ -22,11 +22,11 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include -#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 4df6f79add8580c5750c41571a38a897b1ca1e49..692d2794083948e3cbf299a267b08debe14a90e1 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 93e2c31cd0ede1a5f0a4663fda7b32274417bdaf..0097b6cfd7c29308b052206967c699935f1b681b 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 @@ -40,20 +40,20 @@ #include #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 #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 8affce044c485cd50b00cd24161906371663dd19..a5bf8b02f0bc4e2b2c605ee67ab30207f60753af 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 2bfb74b42727d2661d1bdd284138118ca0f17536..5ba76d31449cc56f81122a7ff4b8d9a46a5f796e 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 @@ -47,22 +47,22 @@ #include #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 #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 de71f54f448d5fdefd616e1fd0aa225b989f9dc5..fb32d74fe6e5308f5dd0cf3350756730f380adfb 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 diff --git a/lib/hostip4.c b/lib/hostip4.c index 3babe72691bd29e2a6942a2f0ab13df86acba0ff..5b64b467339591b07ea60cecb8596a838b1ebb1d 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 @@ -40,21 +40,21 @@ #include #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 #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 5b25d6fc408b4bf92353c0bb60104ac7b2f9a50b..0081df7f5aad9a3aee6f36c59a4f99ce71c8682b 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 @@ -40,22 +40,22 @@ #include #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 #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 eff2efa7bf816737a69a2704cd8889d1cc021d25..9a26f8d44e7e7910e53d81d29f9a27f4044e8d34 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 @@ -40,20 +40,20 @@ #include #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 #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 0013e50654d0a55cb3773a1542fbcc0d3708bd5d..4f4469c5e2ac42d17a58aaa7863be63f8de7e969 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 #endif -#include "urldata.h" +#include "curl_urldata.h" #include -#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 /* 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 d6a0bec13363ec2b44f8615dff8ac4737563fe49..050501b114e4f3f26fe38e889aed230995002381 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 /* 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 17cc95e812c74af923c71c1c340574d515cbaed0..d835eb27bcba6141a669f398e96a01d90e40cc78 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 /* 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 3b22ce10eaf2801c591f4a78368bb4d76018f7fc..c6a4e916107f607f9f57e2ddaaa94807d3a9459d 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 92c363d7cd0794b83424c98565cf45f82ff72a4a..446c49bb9357b1f4e3b7e513a3ece546a55a97ec 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 @@ -56,7 +56,7 @@ #include /* 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 5aa4f9433b6d5540ca7d6e499af685f3adcecd9f..d82b27110e992c0a2d7fbcca189ed85fd4a4495a 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 /* 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 d2e1aa199b86c0b8415f96723f36af0935a516d5..6bbc926156d3a27cc385808fe884dff4a3fb1838 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 -#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 @@ -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 9bc9cb810b69d3a40910dd9546497595ba2f8789..eca2254837cfa037e2dcab6efb8ba9d80de1c573 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 c1905d1757d84b2bb56daf63498e3cd8f4da32df..db9c784464eb5a424f515062aa33adbe3bc80b28 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 @@ -50,16 +50,16 @@ # include #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 #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 70842457cde772c54219ff9f3a95c536d0e633b4..858ec2f5b3b9b608a37012466d8873d3bb873111 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 b17b2d38f6481dc7861808fcbebdb682fcf53b8e..e3ff0868bf53a2197177a25aec694ae053a5142b 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 -#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 #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 02ea346ad0aa02128d7dca7d4940e1811575e90e..7200790080fb032c80ebadd00cd159ad4953f4b2 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 1ff975667805b85de11026cc2a77f7f07e8d38e1..b184029f6d301dd9c3de4d51cebbfa278c7c965b 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 -#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 dbc146d918e0e111bb40ba0e42d3cfbe4e1b9cba..db28ed807aac1e853111c7bb99c9c6c9e5773832 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 d7fbbe9574f422b788e686f4ccb9623cba25d56f..175f938cddf1d974204da455b9c4b27be127b336 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 #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 f991473d6b38dd297f1adb6fb3fc6b934efef164..43c549143076e41460738191ecd090deb3f339fd 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 58354b602cdc9e2ac5067bbd51b6d0959ab01c4d..8ba326ed791d1cb03a5ebd82ddac006228da8522 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 #include -#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 c51041ddafeb1f43dde21a6bc1daf9fafd7c925a..f5389c8575e86a6a193c9276b2ca0c942c7cdabb 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 #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 /* 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 9ef31008c8308cd1c40e5484ab03cec620d35f2b..76c2984ee76a44e76bbf5460fb53126e449630b1 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 -#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 -#include "memdebug.h" +#include "curl_memdebug.h" #ifndef HAVE_LDAP_URL_PARSE diff --git a/lib/llist.c b/lib/llist.c index a302e32d56857d0fbf75cb6c4401dc76db980423..46a8d9960d5b74a21db71b9a6822fccb6eeb3420 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 b4ca82a4450f57b624dbc8a7a23fd0a2b9a13485..27ddb719a5cc0928bde01d34704ce80af1fd8f1d 100644 --- a/lib/llist.h +++ b/lib/llist.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include typedef void (*curl_llist_dtor)(void *, void *); diff --git a/lib/md4.c b/lib/md4.c index cf6c36023b13d01d8b77a8abc09059e74e8bb6cf..d64b472ea6260608290b3c0ce37ea31394af4e46 100644 --- a/lib/md4.c +++ b/lib/md4.c @@ -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; diff --git a/lib/md5.c b/lib/md5.c index ae5812b956dc9d4cf0f6d14e88ea3f1d11890577..74f53f61b5d47c3db8c4718902b53ceba0c7b05a 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -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 /* 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 /* 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 c95f41fc5bd23bc00d92cae1b82f335a07c1589f..e756126b2e0f3af02d5f96a2d9a485c345aa779f 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 -#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 1716e3598709261ab716d63979add81b3edb2910..fbeb61de5d38a5e15ce465a10f80fdd52f5a9922 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 diff --git a/lib/mprintf.c b/lib/mprintf.c index 0990f4024b782cd436a929c8ca92c1e437942b1a..cbd604d36768f3cfd1f835acf58925edae5a8692 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 dae1f6b56af3775fd597d5abbaed23a618037a64..c4f21628d0fc0b3479e1f2d049910d6ffa6e7921 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -20,32 +20,32 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include -#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 #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 162a86caa036a011c0c623d19bc528262660c76e..10853d395fc2548a53e2975b08c34149d381795f 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 @@ -30,18 +30,18 @@ #endif #include -#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 /* 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 8e29227c01879865d38be3bd13a6b0a9693ddfd2..b966b5bbf919d4b6125150cebf12b67841613b61 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 -#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 diff --git a/lib/non-ascii.h b/lib/non-ascii.h index 6dcbe00449dc6f6124eeb41a65532bf66db89c9e..552a513116a871aac1f21a8ce46bdc47c6ef52ed 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 a2722ed7fb4cd4821e36378eaa1a193dea36a15a..6e6d1287fb2ddb5204279102ee5e16d0eb91ccfb 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 @@ -37,7 +37,7 @@ #include #endif -#include "nonblock.h" +#include "curl_nonblock.h" /* * curlx_nonblock() set the given socket to either blocking or non-blocking diff --git a/lib/nss.c b/lib/nss.c index 86ce6a6d5ff0b4bb305f7f6adf7a1b14dbdca1d5..a6829dffe8fb651c8d5132303cf0b38659ae24e5 100644 --- a/lib/nss.c +++ b/lib/nss.c @@ -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 -#include "nssg.h" +#include "curl_nssg.h" #include #include #include @@ -61,11 +61,11 @@ #include #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 647b7bb28e8fe278fa6472d8026765ba094430b3..c98c37f14f7b61b83ad01968eb7cb1afb5778d8e 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 c67342a089bd0604ec13acc35af0388187e89cfa..f63f16b8344aa03fa084ccdb5040a13c850db6a4 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 dd3291155242688af4d8c9b77e95dea25ee6cea7..23ff2a7172785aee4c463be8995a3d359947ec43 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 9ccfa7faeb8dc935b106ecbd89f5e28674abff08..08c06f10d46bd20bed5ad6ec881eb7a56718a76a 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 -#include "urldata.h" +#include "curl_urldata.h" #include -#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 -#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 b6079bc8f4b8225f4f2b3883ce07411b98f501a4..a50b6074e2c3c5a7f88608a5e58501b8dfb536e2 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 #endif #include -#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 85a7a45af70b21f8e07411485ee253657def417b..46817445725ef899f7c153472f3d3026271de9b0 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 #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 1d104cfbc32b81a2046b022edb205c09f1cd6574..77060786a4e06fecad644a91b1ff6c2021b1b693 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 ef074be13297d3d44c97f43710682a5b1fa0c7f0..35794224b2bfc29e8436a98152780eccfa199bd7 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 #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 ad655465e978b0907316115bca662c2e79a43ca3..12b3db28c00ec8993a8cedbdacd02d33ff8d1224 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 7fb4f5c358e3801885fbdb7abbbeaf055c48f3a1..60b98237c1e51a8c3bc7ede0029432da656b932f 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 -#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 #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 e73f01811b3d1bb636155a10c12bbfe75a372cf4..88f802d0a06d7c1257f5e7de3d8875e8020eafc6 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 diff --git a/lib/progress.h b/lib/progress.h index f97fef99614e00f8d950bdf4ef85a566ad880dc9..e68f8041664872610ce63d8aa131f02dbda6dfd3 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 172df31411239e4afe3a6076def75b5392bdac91..d140dc9eb43b1c2217d82964c0a86bdafaeb1f94 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 -#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 a523cb1f30ab4e9b384468730864602d3927de78..3801a11855551593016724d9300c79146b7a1370 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 2cf2fe7cbae6debddb185bccd295e152cecc21d1..17fd1f3f51e853bf4911c93aa9df614ae20d3fd2 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 ca9788ef78bb8f94c1d27184171edcb01fc90de9..917c6f20edadfdc040c9f30667ccdca9eb1592ec 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 -#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 /* 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 b70310b89eaa454996ef4f72d37cfde9ba03d15a..b7544ffbdc1121d091a2cfb1185783d8f1078a86 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 #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 32b6fa55ff70cc7d81a517bfbcce0c5c0b5fce1b..d4519d39e482dac4a9dfb0db2e9101cd2ec88b7e 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 @@ -41,10 +41,10 @@ #include -#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 d66873fe997f431bd961dce6b5ea5d2a741672b2..00789bb8945ac4fe6b244ce4cab82d98dcf124bd 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 diff --git a/lib/sendf.c b/lib/sendf.c index b45e43a3235154e26be912ea462116ba9512b945..35f0d0ea994c0fad5232f24cd1ef2d7efeb742f2 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -20,34 +20,34 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include -#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 /* 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 39911d016edc67baf2fb9307c77b9afb689ea401..39489e40fbb18ed9bb0d78f750874e2e81788d23 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 6d2dc90a8def63b5afef070fe0d60bfb2e2a6573..291567e42ddd943903eb951c7778c863141e8357 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 477c35b0ba063860b3f31e46ce7c05a355f80f40..182e6e99be24282a91b5ca091b005de5cc88cdc2 100644 --- a/lib/share.c +++ b/lib/share.c @@ -20,16 +20,16 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include -#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 b9e6c2538980d0a343fd33b804437eb1a3975a94..ecf6f2a793072c327e1fb3e6acad66fd6cd15c40 100644 --- a/lib/share.h +++ b/lib/share.h @@ -22,10 +22,10 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include -#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 4ddebb6091e5a8120c967813a28eea77f5bdd4ed..2a30ea620a8d2fd55e63b1cd38344a41ea772c08 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 dd39b83b6762bfcfbe57e8a8d54e4afcdc56da52..af1eb40f83c863ef03ca911ba8591cb9a5cce1f3 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 -#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 #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 d30c10a8c3d5742fb9cac4a874f0462adda10075..2f919d199bfaf7954e4e1fec5f69bec96d75328e 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 522a2199f54a09143b37dfba23933082433ae329..6a2151c9d2f4ce65d85bb19ff550454b0631ca90 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 13a756a408f8c22044f8842d3633031fafc97a76..1b70dd6295df934133fb9b3fe92c5161b32d0835 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 #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 0ce0bd044c6daaab5d89fc16da4422dc9e7d94ba..dc4670b24935409a8cd4907bc1828ec1c2814bac 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 02dd485f1b0344dfd2f57e2706e652bba6810323..2bd3d4508c0aaf57f5fe2ada3abf587cf7bdfe2d 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 #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 6e95e3c35a5a957f444fff5a22079edf3b7c74aa..c57610717e075a9b3c329a13877272a7d88739ac 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 #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 ca2323f57fb146569a7c9120e75ab55869265b2a..b9ce77dbf8702d62007c0be958d9d85355355b0b 100644 --- a/lib/speedcheck.c +++ b/lib/speedcheck.c @@ -20,13 +20,13 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include -#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 fc40e7d0cc7e262e8692fc6c1b312eb8267d6357..a933781c0fa7a87ed966ceb894e84360d8bf974d 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 b6664e6df34a3be36a56e5b9d9accbc4e0f2a46e..21f1d222e5681ca6ffcda25bbae550c84c7feaaa 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 49a6dec41dfb2b4b24175b3531e56628f16c6f46..5f9ef24cc6e4b5b49c0539ebe54b932bdf8087c6 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 */ diff --git a/lib/ssh.c b/lib/ssh.c index 1cc4bcd4cf2b94870dc460946e8291ddf8755058..2eac88f2ea8071b64c21df30994ee2e66a08d76a 100644 --- a/lib/ssh.c +++ b/lib/ssh.c @@ -22,7 +22,7 @@ /* #define CURL_LIBSSH2_DEBUG */ -#include "setup.h" +#include "curl_setup.h" #ifdef USE_LIBSSH2 @@ -60,36 +60,36 @@ #endif #include -#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 #include "curl_memory.h" /* The last #include file should be: */ -#include "memdebug.h" +#include "curl_memdebug.h" #ifdef WIN32 # undef PATH_MAX diff --git a/lib/ssh.h b/lib/ssh.h index bf43fdf3a1a4c7aee9a80fbac416c79fb3ff74e3..ff2e16be941ea62e235429dafd473a845e03cc66 100644 --- a/lib/ssh.h +++ b/lib/ssh.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef HAVE_LIBSSH2_H #include diff --git a/lib/sslgen.c b/lib/sslgen.c index 67dd71fa64277fbde05e2ea09e901351eda2b6bb..d85ba8ae693516224cc3429a3934593839f99ec0 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 2369b552cf26fd052f5942b98e3bfc82e9be7b09..17ad8e343d8283c4df7497f475210a2f513f4c1f 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 8f9fce4c87b8eff1bcea1681fae8b189aa7125ad..c5e56099bc398fc320d7657349f7213ae6e481f3 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 #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 @@ -67,12 +67,12 @@ #include #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 5375a6a65de7e3a28b221010d18d4713cf3dbad9..42e999eec917b126347d1f3db56da639a8750818 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 27014354d79c84932929b550fc4e785efeaee110..8dcaa67f0606569009b8c3b52abc023e660faa4c 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 4edbcd7d4e476366c64e73cc644507921bf4b249..49af9117ee90f2959351d6f142714260e2bb5fa3 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 89ad8a6e8defcef8d551569e789fa29734f89278..5d370c854ca5853ff9eca0c19234d798866e99b0 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 #endif -#include "strequal.h" +#include "curl_strequal.h" /* * @unittest: 1301 diff --git a/lib/strerror.c b/lib/strerror.c index 0c82a53e4c8945213efe9d71d4f62d215ada2d23..27567a1ac71e59c030c4fe71428e523b10c062d2 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 #endif -#include "strerror.h" +#include "curl_strerror.h" #define _MPRINTF_REPLACE /* use our functions only */ #include #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 f1b22210acfbba4c122d974baa0b654ed745eec7..60f193f97276e5c0851b2bf746f14aa713a0c228 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 94eac0e642c3d61ab4ccca5926da51c4e49838e8..33bdd96afd9097c85ecbba231d1ac55ffa84756d 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 -#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 8baf77948f6bc29433cf660c49c203c2394cce8d..1147d70d3c2bbdcfdb57205b06d23c8e2b99058c 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 #ifndef HAVE_STRTOK_R diff --git a/lib/strtoofft.c b/lib/strtoofft.c index c61459de89f82060f918eac8bce671b507de7f32..d203d9cc7a352f0e175e0ef1c5d507b65d4dbc54 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 08b0e6d91e2d2bfc173f7a6ecc5163915980db01..b812a67a0a85a67d6d72fd87e18a2a41d920e412 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 a64da090f2e071bc42ca580739a8e6dae5389814..54eab1c92a9a11883048000673d1acc8bef3a2eb 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 #endif -#include "urldata.h" +#include "curl_urldata.h" #include -#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 @@ -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 97276ea99ab3234d6c8948d111839a3e39ea8cfa..39d9f58e5daa727374e252998d69fb25e80ee8fa 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 #endif -#include "urldata.h" +#include "curl_urldata.h" #include -#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 #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 2fd72014481451916e7337ec0cef22e5939adb56..8e4c7bd76624b22e47e67094831c421326fdbcb6 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 b464ae4068919e07f8bd19a652fa248ef9a522f7..3f1b9ea70d8a4ac9e766dcce69ef4234b26859ce 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 6194908d648c98ba268c7134cc13e88f297052ec..c37f6c6b24158c6e591dac099d46e4751ea530c5 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 @@ -57,35 +57,35 @@ #error "We can't compile without socket() support!" #endif -#include "urldata.h" +#include "curl_urldata.h" #include -#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 /* 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; diff --git a/lib/url.c b/lib/url.c index 58befecab26fa160ec8f91afe5002da9d5fb968b..8c2ab27cbcc0d9ff9e5c0f5f8c11088f4136bae2 100644 --- a/lib/url.c +++ b/lib/url.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #ifdef HAVE_NETINET_IN_H #include @@ -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 #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 */ diff --git a/lib/url.h b/lib/url.h index ab6d3d04834cfd6df36776afacb45d9b7ce85568..a026e90e8535c8cd6272d6adf74abea8e9703041 100644 --- a/lib/url.h +++ b/lib/url.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" /* * Prototypes for library-wide functions provided by url.c diff --git a/lib/urldata.h b/lib/urldata.h index cd50f623fcabaf64ca9ee2d53a24c186168296b8..d5d1859c9e8d65e2c385d13f3d0df0765330025d 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 #endif -#include "timeval.h" +#include "curl_timeval.h" #ifdef HAVE_ZLIB_H #include /* for content-encoding */ @@ -162,20 +162,20 @@ #include -#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 ef8353ae2a08eb94df007e8f2267294eb0470454..fe1f736608c05d906d58584434454597bd0568cb 100644 --- a/lib/version.c +++ b/lib/version.c @@ -20,11 +20,11 @@ * ***************************************************************************/ -#include "setup.h" +#include "curl_setup.h" #include -#include "urldata.h" -#include "sslgen.h" +#include "curl_urldata.h" +#include "curl_sslgen.h" #define _MPRINTF_REPLACE /* use the internal *printf() functions */ #include diff --git a/lib/warnless.c b/lib/warnless.c index 9cc7be9d3fc7d1b9198ddcd37014e44d82075595..30cdbe6f008d17ae4cb60d4e82aeb953a725b5f9 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 6f4c7380c4aa430c66d8c69dfd536b9d504386b4..d6ba2b27684d4b4dbd6aed956a2e8c8aa2e2bbd7 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 #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 2e2d868d6632aeb393c2ce2f0d95626eb56473a8..f48e2f87d0625109a31ff51d64fb57c3a4318885 100644 --- a/m4/curl-reentrant.m4 +++ b/m4/curl-reentrant.m4 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2012, Daniel Stenberg, , 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 1baff3951b8d08b48f9e0f61dc7cc6ba9d93d796..4ef9acbf6d6aba11683fff95d29d56993cc23ba5 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, , 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 5527ce7201b8092db5a7c1a803f01b0123d40f45..61ae1e0f3eb9f09994b63ff710d8d31c30f70a2b 100644 --- a/packages/OS400/os400sys.c +++ b/packages/OS400/os400sys.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, , 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 #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 93f86cbad43d06ff7115ecbf2255484b022e6643..bda83577993fd4c1fef0496ce3b83c0efd16405b 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 444b669ba2dfcac87b0c5a63a327852c5139a711..df6822aae64d212553bdb06e6814852347dac0e5 100644 --- a/src/mkhelp.pl +++ b/src/mkhelp.pl @@ -140,7 +140,7 @@ HEAD if($c) { print < -#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 92033ac03c065c372d701652f6f829aa3b14df94..26b50ada2635e7d315e23d880e9d1174f6df9a5e 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 277830546e4dff5e49d9ffe5912c83fdd8482487..6a2a3316564d50e982f5f03f4093eef5cf4b0a6e 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 1850ba0c667ed68439438938b57ce7bfdbdd551f..321c661337c5b06c7de82444b17a1591e43bd8c8 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 ef340f7983ce7b3b227df5b48bae3c61fafd30a2..e6988184a843a281819a9212f0846d7031aaaed2 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 7a701b6927246073e92545a733dba8a29a2da317..1b8842f2af105fd72c9f5ee83c00945d14cf6d4f 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 4565a15d6d67c695bf9c6eac03993c53f2d0217f..88dfbe8525e6ad546a7cd8158b3b233880c6ef5f 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 2f49e1d96d1440dc47af153ae0c06b810fed7a92..1e36f5962368b35e706b8e9eaf6b185875d29365 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 d6688110a4084f803fcdcadc2817678eaccb9c4d..a055b444e73c4d9c8c40493b1e786429dbff8f63 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 da11f4afe4a6f56dc9089148b8a0b0775c229e7a..6cd9d33e7b5947389f657dc1d894e890e2c5b9f3 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 ecce036a09a40b19046e45cb69a06cf579b95575..2011db0e75730fd59b27fc4164e0eb6eb36e5f62 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 4ba1c437527dce779226134fe74cb8bf756c7917..39158edcd3c3c11bbd2fc11d61ed35ffd4571ee3 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 4fae91d32c42ee59167e576d82851a40ac692f99..5afff1ecf470b48770c1e1b3963d8b5199ff9779 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 339dde563282737595b9912a3c46fa45760e6546..6aaa4116a43ba378cbd24cf7d6aa31411f995714 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 12b1a9d46562ea375ed7b93ab7bc7532d898fb13..76a5db1fc8fb3777f1340f190fb50b114f6b4995 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 297b986f5c47cb630d85e3d8620798b0e41ddd2a..9938e24ecf08913bf762c443dceb3dbe086f5e07 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 0ac7dcbe01eeda35d9e458de786aa0238a983b32..6a841d414aad1654ef9cc7e5924440866939d559 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 124f6404dc8c2d6eb1399126ca547283e55cb62e..682fee980d2105612ec6b1cd14b96c2117a2e848 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 ae8aaaf32df54d16ab5ca469ca2f14d9a86d6216..e37576464a605a7709953640c3ab87209dcc8d44 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 cb90095e515de615eeaddae6436cccecbeb81ce0..a6e07928f52fe81875da43c2b0172bbdb43d708e 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 81b6680c81aead6a33942603ed33fbf16fe30708..c6013a761f04576874e5005752894dbcbea340d1 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 9c0a19f3f1e1c57902518b2d1a5606331a64b23f..dc6d8d75d92652b916e778b3a54eebc16049ab7d 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 f9e9869b2d059ab48921ba0152a984209bf6f4ec..ff5f19c3fb72ed0a9ab36220a0057fccd7b543f6 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 3eda45f91a3ce7d260e059b2cbdd4d1231663427..e0cebb1096d68ae8c409e8514fcc245691e53d96 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 80fdf4e27bb6f331cb4b4bb0bdf73d86221aeeb8..9c58afa9c55d8a1e48063d55526c5cbbc30f663d 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 bcbce2000c1218ad241d28603b0345f99cbdd51c..aa488899e8e4fbbd0a4ef0ac4695c3ba75c278ee 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -39,7 +39,7 @@ # include #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 9078b9564e30ed37cf5f2f3d68d7b031dc1c43af..4f8cdf0c0911334c1b1be236915af192381480c8 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 d8718e3289ded40eb4c10b6b867130b505c6de21..632cd34bdb2ac5b400d6da0ad417bddaf2a5d64e 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 5d6f8bbc577a2171f2f7573511fd4490fdf27a45..fe2514dfbd14402e2248a970ac3c024eb77647fc 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 561dada1157f9f3b076db1725abce084b79f166d..21d9e90c51b07f7f84aea8ad0285a8b34d745e74 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 9aefc21d5bdb6d8dca9b845c8c18a991d5af3ba1..08c1af5cb249a0216ff67e8f62d877ec9be85bfb 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 ed3849ba35632f1f2e6cb1246b0c746cf9fc997a..d3dab5c0b296286047deec21c0f05e57418ab8f7 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 49cdc71b81f351ea8c539e14027c69424741e487..e37cde4a5bddfc647ebe45551f9ff2bcf8e90f12 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 2821d008d4bbaa156a9aa7aac003d60c4c8b5542..663370a51fff7ee861e4ce591e233dd4a56f5b78 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 00d205ebc5937690854950ab8e09f07e4c3e9de1..0a0fa69604a19d89bae0e151d798d5f05f1b282f 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 4a6a6f58e26b8945e4425e977a0b46c899b0f507..abb5d1a047aaafb0b09872a7e0db8000d366e6f4 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 a9462d004292af6398790e3d5fb0880e0fe464c7..918a8009d32041906180e668a9cdf3c9b410809f 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 6038a210abbc58e93da0e0994b1b273a5e2d5f18..bbb23af00f4db6f47b2a7f086b43709f0f9e30ee 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 505bdb17a6cf975c38172a776eaef819230c419c..cc74c9da2457af67ea503f783b06274e748d9b39 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 5fb7fe1d1548e0ee221984e4796511d3fc88a426..cc0e8c3b695359e5bca3550c4ef95ec5778e35e9 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 ee442394c88a4bfdd3934dcd90b73518d288a523..6c0047ef67136b6349fc09cda266e7eedbf00646 100755 --- a/tests/convsrctest.pl +++ b/tests/convsrctest.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2012, Daniel Stenberg, , 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 896686bd8be4caa1fcb89c69f11421562cc35310..733cdd31b922cf45812257f40903d60ceb3dff39 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 b9789f88f57c37c306e70b1e0ae8a0c5a4e21212..0c45fea73efd4db12bb1cd8814043f47f644bb5e 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 a18c92e8f1aa0bcb924212d18d9d8b7da9c42ed8..168294ab6b91960ac3f71af36b259f0fbe77780c 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 253acb21ddef0e80317e725edb2ca6d9a4ab72ab..4533548cd7ed265e991adf020b1e84ff761a45be 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 784bdb2a244a12a78fc6082778e268c80999cc68..3659d55c9e9bc6537718231bd71263b4679decd2 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 01a382e8236c57c923cc6b66d6e0dc8f292fafd2..b78f94df5aaa0dab93d72127b56d17b830d7ddaa 100644 --- a/tests/libtest/lib1501.c +++ b/tests/libtest/lib1501.c @@ -24,8 +24,8 @@ #include #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 2b50c47335b6d696ab306d32ef13607c4dbd0850..2368eec45b9ef0241f565b3e9301a1f234fd9cc2 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 dda1d7f42b6d441f2022f641b1c991c45e2a5565..e782d1a3ec53da745e09afbcefea93d730d8f462 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 26275f9776989a78b679fd29b4a8b2e42004b7af..9e5d068758071a3796d8026e05c9462755023541 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 554583ae2aa45ea74d5d0acfa8ebeaa69cec0245..f2adf274eb6fbb65294c522e9170e963e4c6f44e 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 50277f7d354365f563137822a3560286d4cbcde6..19514932962d8f6d9caff461063fdd44e37694ae 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 358fc98dc8080cfdb7596d1e71f29761791ebf70..1e2584f3a5dddd714a53b616fd6c066b9128828b 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 99b3a0afe60a4a0afc2f176acf5a42e178f7ec37..6ff4e84789c0eed479bf9e6d8d40f8520bc1883b 100644 --- a/tests/libtest/lib505.c +++ b/tests/libtest/lib505.c @@ -25,7 +25,7 @@ #include #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 4477eaa50f322e1a85469b401c81fc6c4068ee85..0b46456704b5da90e8fad37dc8980bfddb6ba3d9 100644 --- a/tests/libtest/lib506.c +++ b/tests/libtest/lib506.c @@ -23,7 +23,7 @@ #include -#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 87c21defbdf6372bbb84955fd32e47d73de73131..a27bf99f1de820308a466f1303ed0372c601535c 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 1aca064e9bc45ef7e4d0c2b08be8ab85e354575f..c8fada3de53df7a07758c3d7c168369181c2d5a9 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 8278631c13602f75788525a893cbf8ef9d2d8c66..0ec8b1e5862b22e66b431ea1595d67760e8fc1b7 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 6be2d2f76cc7bec2cafb3b0a690b12e002802ccd..f90804b2ae85786bf57130446f0afd69a233eadd 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 19da18b4fca9e9c9ec3cfa1fd7bb98014a6ffc0b..364744481b74110d3c0cd9288280418dc7f4c712 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 c013ac258acf056d730b98a627920e84556193fe..efec49b0a39dc44359e781e228fd1b98d60eb153 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 953e90dff1838380d70427757bd3eb36c1dd4fb3..7e0066ce51565383e987ddbc05244bb406d030a2 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 4e96c4a8d88e6603a58ba138f86c226fdc14362d..e403840de6842d06aaef91c10a14502046ae57d5 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 a9590948dde93b69b450cc323d6bd1696c626a22..96ee441148209c359fc3c4332eeb5b7871249c32 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 ba49ec41ec641d9c9aaede226971184a31f60e9f..e728acfa2a0dd457946ee51ecdc8dd713593a96a 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 23f7f17c61eaf358340363aaf2a9d6cf828971ad..b6b1e1d7c0d8f9cb96a0ddea6f431eb6fc23280b 100644 --- a/tests/libtest/lib518.c +++ b/tests/libtest/lib518.c @@ -31,8 +31,8 @@ #include #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 b720c8feeeef74df7e9637a9525a7c0474b1d4c8..43efc1753c48cc59b3cafb3d83d46c8e8d188d10 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 9ffaa4f9212a6620203543d09438d070b93b52a8..6d70411c4d8b4ea07c047d6749a1a0e796f06bbe 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 93c306864b59364d3268b7aff79256052d451caf..57d938b9927ca9e2afc10ff636ebf861c6a97054 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 0fdc83db621e15a6b6312ca96b2e2f1cac4ae202..e7004e20f049d3b5b2127a1a6a056a0b3c2e391a 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 6f56df9b0197401c5da37c1dfd2ccc55680bf1ff..45aee7fb8ce5abd9f1cdd67b7044ae039c0b20c2 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 ca128cb9c641c8b5848a3b2e15d324aa568ad53b..ce7d559d4257592de1cc848903e31c5b550c97fe 100644 --- a/tests/libtest/lib525.c +++ b/tests/libtest/lib525.c @@ -24,8 +24,8 @@ #include #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 9db04dba701d69a1a1098bf2ba9a106390ab48e9..a89442684ff889e0e5466287689a36dd9de51cc9 100644 --- a/tests/libtest/lib526.c +++ b/tests/libtest/lib526.c @@ -43,8 +43,8 @@ #include #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 ad84ff8a5579b6328c7d00168c135cf76c2bb292..ba933b3357f9efc21aa695b95dc1101e62623c58 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 fdc18a1eb959c4a902cbdc86f4fb3e828ae8ffac..6b2671b51ce506efe997440efaa5a3a59ae81c93 100644 --- a/tests/libtest/lib533.c +++ b/tests/libtest/lib533.c @@ -26,8 +26,8 @@ #include #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 e3ae402b710e02785d71f6ed64dc24ce1ee2c22c..1f7a798d17225d3d538464a19e56a6f7154e9531 100644 --- a/tests/libtest/lib536.c +++ b/tests/libtest/lib536.c @@ -24,8 +24,8 @@ #include #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 24d2522353053969de7cf8c0d344f8efd04f2fd7..2d55d480dd8e2160a9bc95ca855e37c39488f4a6 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -31,8 +31,8 @@ #include #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 923893fb2fecb29aacc99fa4a6c8e0ea777b4f8b..2e6396a13ba64b44df6bfb1fb01d8520b66bdb16 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 ac0ebe60b745bf7332b6d09628d36ca45323900c..a36693de398298d25b13c209a3cded2d7ded8e3c 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 5fe8dd8ad807419771cc7b853c94d9f17b150029..22388bdabcad6e94dc01deeab66ac9fb3d75c622 100644 --- a/tests/libtest/lib541.c +++ b/tests/libtest/lib541.c @@ -25,7 +25,7 @@ #include #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 84f493f3e2688b5ecba697ba7e818967e7d35aaf..a5cb3e2040f96f75641af9bc2033aa8ca32a02fb 100644 --- a/tests/libtest/lib542.c +++ b/tests/libtest/lib542.c @@ -25,7 +25,7 @@ #include #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 b4a31ca9add63aaff88898ba4a1e65f9af1afc68..35e32e6f4564f2f37072cd98922c51343d8b7508 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 b766187f27b063f9e690c6ac58768f85c6580239..adb0345fb08a4ee195da7816ed0cedfd44ff55e7 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 c82bc3f232bb72f796e7890e16c7a64651b9cffa..58d10824def4d65f747d2881a207fa7f2ef63cb1 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 a1568c88f4517f41d54fea6e0edb30e2fa9d0ab9..8856ef174909f3cdd838c2ed640051343a35e228 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 2cc942ad4f39685ad302a2fbc0f34c6ac6509b74..1d3278fa8ed4f10297e73db5c85b9ebde52bf1e6 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 cb1cefd5e61dae2ed7f0ddf8278f762218cbd498..ce96cebbb3f8a3d7ca6761fb97afba032398b245 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 0596f3ef19150926308ca027828fb947cd9f88f2..1c90b9b0ba2ce987ae07e14f0589a1399643772a 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 49a81bf577423e66c19486271b05e1908cfd3326..3c42051796b2ced9fec0228f6cd0758eb1fd566c 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 98062209f60c54985293ab9b2dad0fed4a34c6d9..1eb2e1562c38851d1a3e1d5ae932456b59329ee2 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 dc3bcae865adb8b22803ab966cb48f14adbac214..721338867747fd35daf432f532247b2d962abf5e 100644 --- a/tests/libtest/lib557.c +++ b/tests/libtest/lib557.c @@ -29,7 +29,7 @@ #include -#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 e8be1c7bddee2dbecf99dc1ec0a00bd999762132..90c07323b1ae099dcf69e7bb77b5d10e968d7ad4 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 a5f0ea534884f7e9fed764bd10f55a32a1fa95c3..b00bd83d108720995976ef7fb23f7a2aa67884e7 100644 --- a/tests/libtest/lib562.c +++ b/tests/libtest/lib562.c @@ -25,7 +25,7 @@ #include #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 ed00e1bf62a3641891f9d44932ff79fe1e189229..84d0a20b67e885d55a23303fb04793fa6b3848dc 100644 --- a/tests/libtest/lib564.c +++ b/tests/libtest/lib564.c @@ -24,8 +24,8 @@ #include #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 ba839d65f9a4ce1b367ddbf5f2efe4ed6286b14c..f95872c5a9ecb47828150f156d473ae5081c12c4 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 573529cd86abec34abc553ed923f1e658d8fd60e..8b698394e0e45b267f51f94470774bc71f300723 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 4b15821f28ec2c9396e6fea7f9c44596e10d091b..3e69a68f0a28c6a4d397b508a7fcc76ca8d749c0 100644 --- a/tests/libtest/lib568.c +++ b/tests/libtest/lib568.c @@ -30,7 +30,7 @@ #include -#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 a434d7459ea8ecc72c3281f964665b2a2146392f..c7635f19aa4b79cb7e286aa1b80205dcca1c58e7 100644 --- a/tests/libtest/lib569.c +++ b/tests/libtest/lib569.c @@ -23,7 +23,7 @@ #include -#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 a9fac9915ec5e6f1b7d548072005fb4637489a4f..b9a105f08b5beaa518c976fd492b05e8b0a45ecc 100644 --- a/tests/libtest/lib570.c +++ b/tests/libtest/lib570.c @@ -23,7 +23,7 @@ #include -#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 ba0aa1ce414cf789a9e83ee4ac44343cf7f33813..977c7723ea97bdb49447bfcf6c3b5195a9cc95e7 100644 --- a/tests/libtest/lib571.c +++ b/tests/libtest/lib571.c @@ -39,8 +39,8 @@ #include -#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 3df4d036ac41b1de2ad790ed25d38f3b16308aba..78e5c804c1568c66be326df52524c6b894960009 100644 --- a/tests/libtest/lib572.c +++ b/tests/libtest/lib572.c @@ -30,7 +30,7 @@ #include -#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 b49d26a5df162fda1cac3236f62917890e679162..34fdb99bd1811edd88ac688e7f1adce18feab2ca 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 afb2bceaef67a4de459cb3b76e72765bc605a3c6..4f77ae394adb0b151c2cab89a24bf3d114c84158 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 942df68c5798f86c4723f364ce4ec1d363c3f310..74d098ee15367ad7c90ea494d5d0986e3106e5ea 100644 --- a/tests/libtest/lib575.c +++ b/tests/libtest/lib575.c @@ -24,8 +24,8 @@ #include #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 61bb61325d7f0778f52a586ef138ca45e1036e24..7ee86c68c5052d338abbc81703cdf8380627a10e 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 a39b31772a8fab6a7582588a98e6a7749bfae6d5..eee42663b6ee8836b383da7ab50c77e121ca8d73 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 c5cf603bbf0ba14d0b2145067d88621415ccd774..e6c0e6f6e39a034f98b8597841b64b249e95e886 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 952efb4ed90d91bfe651c5748c8f24ed59c2a4e3..bd88e43aa66116cc88236518ee05053c9fe33bf2 100644 --- a/tests/libtest/lib582.c +++ b/tests/libtest/lib582.c @@ -24,8 +24,8 @@ #include #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 ad5a5cea79bde3ad2d74e386a93607968b6d823b..4ef9e5a355e3778844ac895ea140e3d04497443c 100644 --- a/tests/libtest/lib583.c +++ b/tests/libtest/lib583.c @@ -28,7 +28,7 @@ #include -#include "memdebug.h" +#include "curl_memdebug.h" int test(char *URL) { diff --git a/tests/libtest/lib586.c b/tests/libtest/lib586.c index 2cf04fe85043e24b54fdef3fcd3cf2622168feaa..34f0939671f40fe808b7274743fc87b8fb32a625 100644 --- a/tests/libtest/lib586.c +++ b/tests/libtest/lib586.c @@ -23,7 +23,7 @@ #include -#include "memdebug.h" +#include "curl_memdebug.h" #define THREADS 2 diff --git a/tests/libtest/lib590.c b/tests/libtest/lib590.c index 68603c65ea1ee80f6f280ab84e79fedeb7f53726..26e88731cce8785f5802247736e3b0bff98e0727 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 5cd4644e305c2829fd847cd25e4900ae026a1eb3..48648fb2426c0b2b8d2d2a981ad5259b7a65cbb0 100644 --- a/tests/libtest/lib591.c +++ b/tests/libtest/lib591.c @@ -30,8 +30,8 @@ #include #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 a27cefd5ba1f09ca2f92c9b1bcaacc7c65999a6d..aae6500ae906246ebec01217d540c28ec7ff8744 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 e9c1ad776f0a62d5be35e813d4328318fd0b6273..53fabd168b71e7df1b16e0fe68de9c1cf15d65ba 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 6b092677a0f03814fba8966ec8a118760722a2cf..6de586932e9cdf4cabb945aefa0915a0dcab9150 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 95761325abad2075322f5b6b05ff25f679d85bd0..c5cc6cfd83ff5e82df8d2b94063d9bdac39dbeb6 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 b540ebf580a14d60982497be9da6c1a1d3463ea7..c7cc93350070539a264eb3e31472f0d44c79fff5 100644 --- a/tests/libtest/libntlmconnect.c +++ b/tests/libtest/libntlmconnect.c @@ -27,8 +27,8 @@ #include #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 f131fe9fb3a8625163b0633ee759c8aaeaaf0125..9da6a67307f88fed87e7fbb5d65c1d62d2437860 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 fcc91ad8bfc82eae717803c2b1d5b86ce189554c..b45e7211205561d67b1929d8ada0df99d21c262e 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 @@ -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 c977d2105360ba853b7fe5a46573abf497db9a43..0f74d8d9fd49d088209980e333f6e1ac6aea568e 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 3ad18c98731789cb0e540d2af69be7d731fa21e8..456d799e72dec44c8365db45bbe83813594d438d 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 0c6be2fc432d702a6862cd4f3158fe23c370d0a0..a236970a6784c84fa0d3ec8628760fd83393be60 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 676df25e91189051bc05c74d79b27d4284e21497..8f599ae0a6a25bfc4302950de6480c9a28f24c81 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 0401df215664c1e24caf559dbe8cb7a142ea35ef..2e82c11330aa9170fb2c25ab3914827cf0487e8b 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 4a12ea8722e24f1a3e0d01abefae6b273f4aa4b4..2dbbf266049277dea1fe96738aaac82ac119fe03 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 64f0675e7491f4e7749f9f766159b56ab554aa60..1c10e48128f5e61e3acbcb196023ffd1e4fce8d3 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 f37f88cba69a550e29d437512c9d568b2af59954..56719f05bee987d1131dd23f387b4a08dd3b837e 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 d0609888a42e2ae6e103712cb5f8319d234e5d5d..a094b4d70295089552ddb09c6729fbaf92b03621 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 3c55eff3527290f3582212f386d6d4879f4bada0..65f84e6e1eb782ae7b9f41573d6c039935b64aca 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 193ad84d70ca7a28cfaaa29ef18f4a8bb4ba26ab..d3efc93eb4feae797a8b09a4b515742b6fcbc8db 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 similarity index 100% rename from tests/server/tftp.h rename to tests/server/server_tftp.h diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 93d0b5d14234257d8eaf246108b8489a682ed7c8..394449ca945c4bc2a2d0ebabbd521d46de9e43a7 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 44d899fd7e362dc3af59f7f0c02c4942f685767a..3afbe3e8307ef1bbb827ea03b2fe400947f2e4a8 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 912096f0b9c4da6a3c4f816485eac940be07bfc8..255bbe8d353b41f3619f805f639b463e7c94cfb1 100644 --- a/tests/server/testpart.c +++ b/tests/server/testpart.c @@ -26,8 +26,8 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include -/* 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 e8c3c2d8272c8c4f9c44979af29bdec9c98eee0e..c1033a5c089f5aee7db20d1b4c8bea42755a5abc 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -67,7 +67,7 @@ #ifdef HAVE_ARPA_TFTP_H #include #else -#include "tftp.h" +#include "server_tftp.h" #endif #ifdef HAVE_NETDB_H #include @@ -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 30766d80f3df3ffc0d0bdf7b5a0d865980b4d5e9..ef3c8f6a34af3d3144f484ad4ac4440651b29728 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 2b8341683c1476791fcb34ef3b84273cfc315fff..ba27e4ecc5e66db38630bf3f94f4a987eb3a5034 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 47df481a83f07afc13fe9564f1fb85fe5080911c..5baf4d5c02493fb6dcb4c963b90c425315208fd6 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 fc50c88656e97d211d71e19d308573dad5be5a97..e431fffca411f2405f3bd4d9f75af225b975ef2d 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 2e4f23096b43d7b7b7e383fb166431355e5142b3..7e9dbc15832536eacc6c3de94865332bee3a8e46 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 8ddd8caee849a522c20d63afb2ba6b31d0ee374d..3ebd89cbdbbe8bd1d7afcd40a815d04259e94e02 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 5900c6dd5480a649c0b4dd8619c27ba65abd7648..a4b4311148df699a71f25b970506bfe5da8e74fb 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 1304ba18e9413e0b1eff90f800fac07ec11366f8..4a741a19d7330c1c58c1f0d11c50cd9402ffe195 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)