diff options
Diffstat (limited to 'lib')
97 files changed, 122 insertions, 122 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 7c258b3fa..6e8a83fad 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -25,13 +25,13 @@ CMAKE_DIST = CMakeLists.txt curl_config.h.cmake EXTRA_DIST = Makefile.m32 config-win32.h \ config-win32ce.h config-riscos.h config-mac.h curl_config.h.in \ - makefile.dj config-dos.h libcurl.plist libcurl.rc config-amigaos.h \ + makefile.dj config-dos.h libgnurl.plist libcurl.rc config-amigaos.h \ makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h \ config-os400.h setup-os400.h config-symbian.h Makefile.Watcom \ config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \ firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl -lib_LTLIBRARIES = libcurl.la +lib_LTLIBRARIES = libgnurl.la if BUILD_UNITTESTS noinst_LTLIBRARIES = libcurlu.la @@ -83,43 +83,43 @@ AM_CPPFLAGS += -DBUILDING_LIBCURL AM_LDFLAGS = AM_CFLAGS = -libcurl_la_CPPFLAGS_EXTRA = -libcurl_la_LDFLAGS_EXTRA = -libcurl_la_CFLAGS_EXTRA = +libgnurl_la_CPPFLAGS_EXTRA = +libgnurl_la_LDFLAGS_EXTRA = +libgnurl_la_CFLAGS_EXTRA = if CURL_LT_SHLIB_USE_VERSION_INFO -libcurl_la_LDFLAGS_EXTRA += $(VERSIONINFO) +libgnurl_la_LDFLAGS_EXTRA += $(VERSIONINFO) endif if CURL_LT_SHLIB_USE_NO_UNDEFINED -libcurl_la_LDFLAGS_EXTRA += -no-undefined +libgnurl_la_LDFLAGS_EXTRA += -no-undefined endif if CURL_LT_SHLIB_USE_MIMPURE_TEXT -libcurl_la_LDFLAGS_EXTRA += -mimpure-text +libgnurl_la_LDFLAGS_EXTRA += -mimpure-text endif if CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS -libcurl_la_LDFLAGS_EXTRA += -Wl,--version-script=libcurl.vers +libgnurl_la_LDFLAGS_EXTRA += -Wl,--version-script=libcurl.vers else # if symbol-hiding is enabled, hide them! if DOING_CURL_SYMBOL_HIDING -libcurl_la_LDFLAGS_EXTRA += -export-symbols-regex '^curl_.*' +libgnurl_la_LDFLAGS_EXTRA += -export-symbols-regex '^curl_.*' endif endif if USE_CPPFLAG_CURL_STATICLIB -libcurl_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB +libgnurl_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB endif if DOING_CURL_SYMBOL_HIDING -libcurl_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS -libcurl_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING) +libgnurl_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS +libgnurl_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING) endif -libcurl_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_la_CPPFLAGS_EXTRA) -libcurl_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS) -libcurl_la_CFLAGS = $(AM_CFLAGS) $(libcurl_la_CFLAGS_EXTRA) +libgnurl_la_CPPFLAGS = $(AM_CPPFLAGS) $(libgnurl_la_CPPFLAGS_EXTRA) +libgnurl_la_LDFLAGS = $(AM_LDFLAGS) $(libgnurl_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS) +libgnurl_la_CFLAGS = $(AM_CFLAGS) $(libgnurl_la_CFLAGS_EXTRA) libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS) @@ -128,7 +128,7 @@ libcurlu_la_CFLAGS = $(AM_CFLAGS) # Makefile.inc provides the CSOURCES and HHEADERS defines include Makefile.inc -libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS) +libgnurl_la_SOURCES = $(CSOURCES) $(HHEADERS) libcurlu_la_SOURCES = $(CSOURCES) $(HHEADERS) CHECKSRC = $(CS_$(V)) diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 29885a19e..db946968f 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -345,7 +345,7 @@ $(OBJDIR)/%.o: %.c # @echo Compiling $< $(CC) $(CFLAGS) -c $< -o $@ -$(OBJDIR)/version.inc: $(CURL_INC)/curl/curlver.h $(OBJDIR) +$(OBJDIR)/version.inc: $(CURL_INC)/gnurl/curlver.h $(OBJDIR) @echo Creating $@ @$(AWK) -f ../packages/NetWare/get_ver.awk $< > $@ @@ -676,7 +676,7 @@ else @echo $(DL)#define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE")$(DL) >> $@ endif -$(EXPORTF): $(CURL_INC)/curl/curl.h $(CURL_INC)/curl/easy.h $(CURL_INC)/curl/multi.h $(CURL_INC)/curl/mprintf.h +$(EXPORTF): $(CURL_INC)/gnurl/curl.h $(CURL_INC)/gnurl/easy.h $(CURL_INC)/gnurl/multi.h $(CURL_INC)/gnurl/mprintf.h @echo Creating $@ @$(AWK) -f ../packages/NetWare/get_exp.awk $^ > $@ diff --git a/lib/altsvc.c b/lib/altsvc.c index 85a4e01b5..73cd5d734 100644 --- a/lib/altsvc.c +++ b/lib/altsvc.c @@ -26,7 +26,7 @@ #include "curl_setup.h" #if !defined(CURL_DISABLE_HTTP) && defined(USE_ALTSVC) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "altsvc.h" #include "curl_get_line.h" diff --git a/lib/altsvc.h b/lib/altsvc.h index eefb45bf6..83e647b87 100644 --- a/lib/altsvc.h +++ b/lib/altsvc.h @@ -24,7 +24,7 @@ #include "curl_setup.h" #if !defined(CURL_DISABLE_HTTP) && defined(USE_ALTSVC) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "llist.h" enum alpnid { diff --git a/lib/conncache.c b/lib/conncache.c index 2f4dd4bc3..028f4aed3 100644 --- a/lib/conncache.c +++ b/lib/conncache.c @@ -23,7 +23,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "url.h" diff --git a/lib/content_encoding.c b/lib/content_encoding.c index 6d4753788..5074b246e 100644 --- a/lib/content_encoding.c +++ b/lib/content_encoding.c @@ -23,7 +23,7 @@ #include "curl_setup.h" #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include <stddef.h> #ifdef HAVE_ZLIB_H diff --git a/lib/cookie.h b/lib/cookie.h index b2730cfb9..6e314f9fa 100644 --- a/lib/cookie.h +++ b/lib/cookie.h @@ -23,7 +23,7 @@ ***************************************************************************/ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> struct Cookie { struct Cookie *next; /* next in the chain */ diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c index 16c4779c1..05287fa9e 100644 --- a/lib/curl_addrinfo.c +++ b/lib/curl_addrinfo.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> diff --git a/lib/curl_fnmatch.c b/lib/curl_fnmatch.c index ab3e7428d..027680083 100644 --- a/lib/curl_fnmatch.c +++ b/lib/curl_fnmatch.c @@ -22,7 +22,7 @@ #include "curl_setup.h" #ifndef CURL_DISABLE_FTP -#include <curl/curl.h> +#include <gnurl/curl.h> #include "curl_fnmatch.h" #include "curl_memory.h" diff --git a/lib/curl_memory.h b/lib/curl_memory.h index ce38a08cd..db93014c3 100644 --- a/lib/curl_memory.h +++ b/lib/curl_memory.h @@ -86,8 +86,8 @@ #ifndef CURL_DID_MEMORY_FUNC_TYPEDEFS /* only if not already done */ /* * The following memory function replacement typedef's are COPIED from - * curl/curl.h and MUST match the originals. We copy them to avoid having to - * include curl/curl.h here. We avoid that include since it includes stdio.h + * gnurl/curl.h and MUST match the originals. We copy them to avoid having to + * include gnurl/curl.h here. We avoid that include since it includes stdio.h * and other headers that may get messed up with defines done here. */ typedef void *(*curl_malloc_callback)(size_t size); diff --git a/lib/curl_memrchr.c b/lib/curl_memrchr.c index eeb3044a9..d17c100a3 100644 --- a/lib/curl_memrchr.c +++ b/lib/curl_memrchr.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "curl_memrchr.h" #include "curl_memory.h" diff --git a/lib/curl_multibyte.c b/lib/curl_multibyte.c index e48334faf..74cc459f3 100644 --- a/lib/curl_multibyte.c +++ b/lib/curl_multibyte.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #if defined(USE_WIN32_IDN) || ((defined(USE_WINDOWS_SSPI) || \ defined(USE_WIN32_LDAP)) && defined(UNICODE)) diff --git a/lib/curl_path.c b/lib/curl_path.c index 85dddcef1..3e1fe2a7c 100644 --- a/lib/curl_path.c +++ b/lib/curl_path.c @@ -24,7 +24,7 @@ #if defined(USE_SSH) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "curl_memory.h" #include "curl_path.h" #include "escape.h" diff --git a/lib/curl_path.h b/lib/curl_path.h index 636c37f20..2f0eae1ca 100644 --- a/lib/curl_path.h +++ b/lib/curl_path.h @@ -23,7 +23,7 @@ ***************************************************************************/ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #ifdef WIN32 diff --git a/lib/curl_printf.h b/lib/curl_printf.h index 0d37b8e57..426468fb5 100644 --- a/lib/curl_printf.h +++ b/lib/curl_printf.h @@ -27,7 +27,7 @@ * *rintf() functions. */ -#include <curl/mprintf.h> +#include <gnurl/mprintf.h> # undef printf # undef fprintf diff --git a/lib/curl_range.c b/lib/curl_range.c index aa3c49332..c9314eba8 100644 --- a/lib/curl_range.c +++ b/lib/curl_range.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "curl_range.h" #include "sendf.h" #include "strtoofft.h" diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c index 16b1de1ae..d92b0b39d 100644 --- a/lib/curl_rtmp.c +++ b/lib/curl_rtmp.c @@ -31,7 +31,7 @@ #include "progress.h" /* for Curl_pgrsSetUploadSize */ #include "transfer.h" #include "warnless.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include <librtmp/rtmp.h> #include "curl_memory.h" /* The last #include file should be: */ diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c index 018e4228b..e8a940211 100644 --- a/lib/curl_sasl.c +++ b/lib/curl_sasl.c @@ -34,7 +34,7 @@ #if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_SMTP) || \ !defined(CURL_DISABLE_POP3) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "curl_base64.h" diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h index 7647a48be..9b780f5d9 100644 --- a/lib/curl_sasl.h +++ b/lib/curl_sasl.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> struct Curl_easy; struct connectdata; diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 27414a540..19c7e0b79 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -142,7 +142,7 @@ /* please, do it beyond the point further indicated in this file. */ /* ================================================================ */ -#include <curl/curl.h> +#include <gnurl/curl.h> #define CURL_SIZEOF_CURL_OFF_T SIZEOF_CURL_OFF_T @@ -199,7 +199,7 @@ /* ================================================================ */ /* No system header file shall be included in this file before this */ -/* point. The only allowed ones are those included from curl/system.h */ +/* point. The only allowed ones are those included from gnurl/system.h */ /* ================================================================ */ /* @@ -330,7 +330,7 @@ #endif #ifndef STDC_HEADERS /* no standard C headers! */ -#include <curl/stdcheaders.h> +#include <gnurl/stdcheaders.h> #endif #ifdef __POCC__ diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c index 1d0de4ed3..a00210ec1 100644 --- a/lib/curl_sspi.c +++ b/lib/curl_sspi.c @@ -24,7 +24,7 @@ #ifdef USE_WINDOWS_SSPI -#include <curl/curl.h> +#include <gnurl/curl.h> #include "curl_sspi.h" #include "curl_multibyte.h" #include "system_win32.h" diff --git a/lib/curl_sspi.h b/lib/curl_sspi.h index 2bbf9477b..694289900 100644 --- a/lib/curl_sspi.h +++ b/lib/curl_sspi.h @@ -26,7 +26,7 @@ #ifdef USE_WINDOWS_SSPI -#include <curl/curl.h> +#include <gnurl/curl.h> /* * When including the following three headers, it is mandatory to define either diff --git a/lib/curl_threads.c b/lib/curl_threads.c index 8e5937aa0..2b36c87b4 100644 --- a/lib/curl_threads.c +++ b/lib/curl_threads.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #if defined(USE_THREADS_POSIX) # ifdef HAVE_PTHREAD_H diff --git a/lib/curlx.h b/lib/curlx.h index 3e9b516f8..a81ddcdb5 100644 --- a/lib/curlx.h +++ b/lib/curlx.h @@ -29,7 +29,7 @@ * be. */ -#include <curl/mprintf.h> +#include <gnurl/mprintf.h> /* this is still a public header file that provides the curl_mprintf() functions while they still are offered publicly. They will be made library- private one day */ diff --git a/lib/dict.c b/lib/dict.c index 208a2336f..c93bf575a 100644 --- a/lib/dict.c +++ b/lib/dict.c @@ -49,7 +49,7 @@ #endif #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "transfer.h" #include "sendf.h" #include "escape.h" diff --git a/lib/dotdot.c b/lib/dotdot.c index 2c6177aea..bb15426c6 100644 --- a/lib/dotdot.c +++ b/lib/dotdot.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "dotdot.h" #include "curl_memory.h" diff --git a/lib/easy.c b/lib/easy.c index a4fff5b36..58aeec2cf 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -51,7 +51,7 @@ #endif #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "transfer.h" #include "vtls/vtls.h" #include "url.h" @@ -975,7 +975,7 @@ void curl_easy_reset(struct Curl_easy *data) * NOTE: if you have the receiving paused and you call this function to remove * the pausing, you may get your write callback called at this point. * - * Action is a bitmask consisting of CURLPAUSE_* bits in curl/curl.h + * Action is a bitmask consisting of CURLPAUSE_* bits in gnurl/curl.h * * NOTE: This is one of few API functions that are allowed to be called from * within a callback. diff --git a/lib/escape.c b/lib/escape.c index 7121db31c..a352b8cf6 100644 --- a/lib/escape.c +++ b/lib/escape.c @@ -25,7 +25,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "warnless.h" diff --git a/lib/file.c b/lib/file.c index d349cd924..45b16de48 100644 --- a/lib/file.c +++ b/lib/file.c @@ -50,7 +50,7 @@ #include "strtoofft.h" #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "progress.h" #include "sendf.h" #include "escape.h" diff --git a/lib/fileinfo.h b/lib/fileinfo.h index f4d8f3b90..ed3347de4 100644 --- a/lib/fileinfo.h +++ b/lib/fileinfo.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> #include "llist.h" struct fileinfo { diff --git a/lib/formdata.c b/lib/formdata.c index 429d479da..ae453b1c6 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "formdata.h" #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_MIME) @@ -45,7 +45,6 @@ #include "curl_memory.h" #include "memdebug.h" - #define HTTPPOST_PTRNAME CURL_HTTPPOST_PTRNAME #define HTTPPOST_FILENAME CURL_HTTPPOST_FILENAME #define HTTPPOST_PTRCONTENTS CURL_HTTPPOST_PTRCONTENTS @@ -46,7 +46,7 @@ #define in_addr_t unsigned long #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "if2ip.h" diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c index c4eb43732..5893bc51f 100644 --- a/lib/ftplistparser.c +++ b/lib/ftplistparser.c @@ -39,7 +39,7 @@ #ifndef CURL_DISABLE_FTP -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "fileinfo.h" diff --git a/lib/getenv.c b/lib/getenv.c index 89d181de3..6acf70760 100644 --- a/lib/getenv.c +++ b/lib/getenv.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "curl_memory.h" #include "memdebug.h" diff --git a/lib/getinfo.c b/lib/getinfo.c index e118da80d..5305090b4 100644 --- a/lib/getinfo.c +++ b/lib/getinfo.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "getinfo.h" diff --git a/lib/gopher.c b/lib/gopher.c index b296c62d1..a7e3ebb08 100644 --- a/lib/gopher.c +++ b/lib/gopher.c @@ -25,7 +25,7 @@ #ifndef CURL_DISABLE_GOPHER #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "transfer.h" #include "sendf.h" #include "progress.h" diff --git a/lib/hash.c b/lib/hash.c index 421d68f76..9e6e3fcee 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "hash.h" #include "llist.h" diff --git a/lib/hmac.c b/lib/hmac.c index bf49ebec5..f6a033c00 100644 --- a/lib/hmac.c +++ b/lib/hmac.c @@ -26,7 +26,7 @@ #ifndef CURL_DISABLE_CRYPTO_AUTH -#include <curl/curl.h> +#include <gnurl/curl.h> #include "curl_hmac.h" #include "curl_memory.h" diff --git a/lib/hostcheck.h b/lib/hostcheck.h index f562df9ae..fcc5d40d6 100644 --- a/lib/hostcheck.h +++ b/lib/hostcheck.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> #define CURL_HOST_NOMATCH 0 #define CURL_HOST_MATCH 1 diff --git a/lib/http.c b/lib/http.c index 9fbd7201e..db5e85b4b 100644 --- a/lib/http.c +++ b/lib/http.c @@ -46,7 +46,7 @@ #endif #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "transfer.h" #include "sendf.h" #include "formdata.h" diff --git a/lib/http.h b/lib/http.h index 72161f6b0..de3769f1e 100644 --- a/lib/http.h +++ b/lib/http.h @@ -96,7 +96,7 @@ CURLcode Curl_http_auth_act(struct connectdata *conn); /* If only the PICKNONE bit is set, there has been a round-trip and we selected to use no auth at all. Ie, we actively select no auth, as opposed to not having one selected. The other CURLAUTH_* defines are present in the - public curl/curl.h header. */ + public gnurl/curl.h header. */ #define CURLAUTH_PICKNONE (1<<30) /* don't use auth */ /* MAX_INITIAL_POST_SIZE indicates the number of bytes that will make the POST diff --git a/lib/http2.c b/lib/http2.c index eb55e62d1..c2a45cded 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -2418,7 +2418,7 @@ bool Curl_h2_http_1_1_error(struct connectdata *conn) #else /* !USE_NGHTTP2 */ /* Satisfy external references even if http2 is not compiled in. */ -#include <curl/curl.h> +#include <gnurl/curl.h> char *curl_pushheader_bynum(struct curl_pushheaders *h, size_t num) { diff --git a/lib/http_proxy.c b/lib/http_proxy.c index ba67b861b..7d8c5eb63 100644 --- a/lib/http_proxy.c +++ b/lib/http_proxy.c @@ -26,7 +26,7 @@ #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "sendf.h" #include "http.h" #include "url.h" diff --git a/lib/imap.c b/lib/imap.c index f3ffa290b..14ea9ae57 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -59,7 +59,7 @@ #define in_addr_t unsigned long #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "hostip.h" diff --git a/lib/ldap.c b/lib/ldap.c index fd31faa3e..66ec35236 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -55,7 +55,7 @@ #endif #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "sendf.h" #include "escape.h" #include "progress.h" diff --git a/lib/libcurl.rc b/lib/libcurl.rc index 4839d0a65..97f490a25 100644 --- a/lib/libcurl.rc +++ b/lib/libcurl.rc @@ -20,7 +20,7 @@ * ***************************************************************************/ #include <winver.h> -#include "../include/curl/curlver.h" +#include "../include/gnurl/curlver.h" LANGUAGE 0, 0 diff --git a/lib/libcurl.plist b/lib/libgnurl.plist index 622f66cfb..33c2fdefa 100644 --- a/lib/libcurl.plist +++ b/lib/libgnurl.plist @@ -9,7 +9,7 @@ <string>English</string> <key>CFBundleExecutable</key> - <string>curl</string> + <string>gnurl</string> <key>CFBundleIdentifier</key> <string>se.haxx.curl.libcurl</string> @@ -18,7 +18,7 @@ <string>7.12.3</string> <key>CFBundleName</key> - <string>libcurl</string> + <string>libgnurl</string> <key>CFBundlePackageType</key> <string>FMWK</string> @@ -30,6 +30,6 @@ <string>libcurl 7.12.3</string> <key>CFBundleGetInfoString</key> - <string>libcurl.plist 7.12.3</string> + <string>libgnurl.plist 7.12.3</string> </dict> </plist> diff --git a/lib/llist.c b/lib/llist.c index f8769c2af..59174c86e 100644 --- a/lib/llist.c +++ b/lib/llist.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "llist.h" #include "curl_memory.h" @@ -24,7 +24,7 @@ #ifndef CURL_DISABLE_CRYPTO_AUTH -#include <curl/curl.h> +#include <gnurl/curl.h> #include "curl_md5.h" #include "curl_hmac.h" diff --git a/lib/memdebug.c b/lib/memdebug.c index ede60094b..c3635772b 100644 --- a/lib/memdebug.c +++ b/lib/memdebug.c @@ -24,7 +24,7 @@ #ifdef CURLDEBUG -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" diff --git a/lib/mime.c b/lib/mime.c index 2135f72c2..eb77cbddd 100644 --- a/lib/mime.c +++ b/lib/mime.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "mime.h" #include "non-ascii.h" diff --git a/lib/mprintf.c b/lib/mprintf.c index e19093678..4c43ad7b2 100644 --- a/lib/mprintf.c +++ b/lib/mprintf.c @@ -36,7 +36,7 @@ */ #include "curl_setup.h" -#include <curl/mprintf.h> +#include <gnurl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ diff --git a/lib/multi.c b/lib/multi.c index 2b6b1bc52..e5761fb7c 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "transfer.h" diff --git a/lib/netrc.c b/lib/netrc.c index f41636e97..a9722df2f 100644 --- a/lib/netrc.c +++ b/lib/netrc.c @@ -27,7 +27,7 @@ #include <pwd.h> #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "netrc.h" #include "strtok.h" #include "strcase.h" diff --git a/lib/non-ascii.c b/lib/non-ascii.c index 42beaec45..ba3240551 100644 --- a/lib/non-ascii.c +++ b/lib/non-ascii.c @@ -24,7 +24,7 @@ #ifdef CURL_DOES_CONVERSIONS -#include <curl/curl.h> +#include <gnurl/curl.h> #include "non-ascii.h" #include "formdata.h" diff --git a/lib/nonblock.h b/lib/nonblock.h index eb18ea1c3..eb45910c5 100644 --- a/lib/nonblock.h +++ b/lib/nonblock.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> /* for curl_socket_t */ +#include <gnurl/curl.h> /* for curl_socket_t */ int curlx_nonblock(curl_socket_t sockfd, /* operate on this */ int nonblock /* TRUE or FALSE */); diff --git a/lib/openldap.c b/lib/openldap.c index eeab2c7a7..cf95f1afa 100644 --- a/lib/openldap.c +++ b/lib/openldap.c @@ -39,7 +39,7 @@ #include <ldap.h> #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "sendf.h" #include "vtls/vtls.h" #include "transfer.h" diff --git a/lib/parsedate.c b/lib/parsedate.c index 7ae5eb8cd..d069642ce 100644 --- a/lib/parsedate.c +++ b/lib/parsedate.c @@ -77,7 +77,7 @@ #include <limits.h> -#include <curl/curl.h> +#include <gnurl/curl.h> #include "strcase.h" #include "warnless.h" #include "parsedate.h" diff --git a/lib/pop3.c b/lib/pop3.c index a681d5213..e06cda1ca 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -61,7 +61,7 @@ #define in_addr_t unsigned long #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "hostip.h" @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #ifdef USE_LIBPSL diff --git a/lib/rand.c b/lib/rand.c index c415048ec..d470c24be 100644 --- a/lib/rand.c +++ b/lib/rand.c @@ -26,7 +26,7 @@ #include <fcntl.h> #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vtls/vtls.h" #include "sendf.h" #include "rand.h" diff --git a/lib/rtsp.c b/lib/rtsp.c index 25e194a23..abeb61707 100644 --- a/lib/rtsp.c +++ b/lib/rtsp.c @@ -25,7 +25,7 @@ #ifndef CURL_DISABLE_RTSP #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "transfer.h" #include "sendf.h" #include "multiif.h" diff --git a/lib/select.c b/lib/select.c index 8cd9eb2ad..f7c53e7b3 100644 --- a/lib/select.c +++ b/lib/select.c @@ -43,7 +43,7 @@ #include <strings.h> /* bzero() in FD_SET */ #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "connect.h" diff --git a/lib/sendf.c b/lib/sendf.c index 5913ea406..5f1f7f316 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -30,7 +30,7 @@ #include <linux/tcp.h> #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" diff --git a/lib/share.c b/lib/share.c index 3d5108610..7d51eebf1 100644 --- a/lib/share.c +++ b/lib/share.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "share.h" #include "psl.h" diff --git a/lib/share.h b/lib/share.h index a7dea41ad..da3bf1765 100644 --- a/lib/share.h +++ b/lib/share.h @@ -23,7 +23,7 @@ ***************************************************************************/ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "cookie.h" #include "psl.h" #include "urldata.h" diff --git a/lib/slist.c b/lib/slist.c index 392b84d13..093465c97 100644 --- a/lib/slist.c +++ b/lib/slist.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "slist.h" diff --git a/lib/smtp.c b/lib/smtp.c index e10d0fbfc..8ef5a04be 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -60,7 +60,7 @@ #define in_addr_t unsigned long #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "hostip.h" diff --git a/lib/speedcheck.c b/lib/speedcheck.c index 3aeea9111..86920a078 100644 --- a/lib/speedcheck.c +++ b/lib/speedcheck.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "multiif.h" diff --git a/lib/ssh-libssh.c b/lib/ssh-libssh.c index ca1337677..4b6f60491 100644 --- a/lib/ssh-libssh.c +++ b/lib/ssh-libssh.c @@ -58,7 +58,7 @@ #define in_addr_t unsigned long #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "hostip.h" @@ -57,7 +57,7 @@ #define in_addr_t unsigned long #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "hostip.h" diff --git a/lib/strcase.c b/lib/strcase.c index 24bcca932..c6732ff78 100644 --- a/lib/strcase.c +++ b/lib/strcase.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "strcase.h" diff --git a/lib/strcase.h b/lib/strcase.h index 6fee3840e..6436e6937 100644 --- a/lib/strcase.h +++ b/lib/strcase.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> /* * Only "raw" case insensitive strings. This is meant to be locale independent diff --git a/lib/strdup.c b/lib/strdup.c index 51e7978b7..e1330ddf1 100644 --- a/lib/strdup.c +++ b/lib/strdup.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "strdup.h" #include "curl_memory.h" diff --git a/lib/strerror.c b/lib/strerror.c index e273f3765..bf027fc0c 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -33,7 +33,7 @@ # endif #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #ifdef USE_LIBIDN2 #include <idn2.h> diff --git a/lib/system_win32.c b/lib/system_win32.c index 52a5fd951..adc227cfc 100644 --- a/lib/system_win32.c +++ b/lib/system_win32.c @@ -24,7 +24,7 @@ #if defined(WIN32) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "system_win32.h" #include "curl_sspi.h" #include "warnless.h" diff --git a/lib/telnet.c b/lib/telnet.c index 955255c36..fa51124dc 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -45,7 +45,7 @@ #endif #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "transfer.h" #include "sendf.h" #include "telnet.h" diff --git a/lib/tftp.c b/lib/tftp.c index 289cda282..4713332d2 100644 --- a/lib/tftp.c +++ b/lib/tftp.c @@ -45,7 +45,7 @@ #endif #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "transfer.h" #include "sendf.h" #include "tftp.h" diff --git a/lib/transfer.c b/lib/transfer.c index b9bb5f6ed..e10e6c9f9 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -55,7 +55,7 @@ #endif #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "netrc.h" #include "content_encoding.h" diff --git a/lib/urldata.h b/lib/urldata.h index fdc185b22..a489ff495 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -96,7 +96,7 @@ #include "timeval.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "http_chunks.h" /* for the structs and enum stuff */ #include "hostip.h" @@ -205,6 +205,7 @@ struct ssl_connect_data { current state of the connection. */ ssl_connection_state state; ssl_connect_state connecting_state; + #if defined(USE_SSL) struct ssl_backend_data *backend; #endif @@ -1628,7 +1629,7 @@ struct UserDefined { curl_sshkeycallback ssh_keyfunc; /* key matching callback */ void *ssh_keyfunc_userp; /* custom pointer to callback */ enum CURL_NETRC_OPTION - use_netrc; /* defined in include/curl.h */ + use_netrc; /* defined in include/gnurl.h */ curl_usessl use_ssl; /* if AUTH TLS is to be attempted etc, for FTP or IMAP or POP3 or others! */ long new_file_perms; /* Permissions to use when creating remote files */ diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c index 6f452c169..d17ceaed3 100644 --- a/lib/vauth/cleartext.c +++ b/lib/vauth/cleartext.c @@ -28,7 +28,7 @@ #if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_SMTP) || \ !defined(CURL_DISABLE_POP3) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "vauth/vauth.h" diff --git a/lib/vauth/cram.c b/lib/vauth/cram.c index d148618b0..d266d2c7c 100644 --- a/lib/vauth/cram.c +++ b/lib/vauth/cram.c @@ -26,7 +26,7 @@ #if !defined(CURL_DISABLE_CRYPTO_AUTH) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "vauth/vauth.h" diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c index 8cd4d83ed..6222a4bcf 100644 --- a/lib/vauth/digest.c +++ b/lib/vauth/digest.c @@ -27,7 +27,7 @@ #if !defined(CURL_DISABLE_CRYPTO_AUTH) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth/vauth.h" #include "vauth/digest.h" diff --git a/lib/vauth/digest.h b/lib/vauth/digest.h index 8686c44a4..cb544da9b 100644 --- a/lib/vauth/digest.h +++ b/lib/vauth/digest.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> #if !defined(CURL_DISABLE_CRYPTO_AUTH) diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c index fe8093e8b..d9db534c4 100644 --- a/lib/vauth/digest_sspi.c +++ b/lib/vauth/digest_sspi.c @@ -27,7 +27,7 @@ #if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_CRYPTO_AUTH) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth/vauth.h" #include "vauth/digest.h" diff --git a/lib/vauth/krb5_gssapi.c b/lib/vauth/krb5_gssapi.c index ea0a5f189..1e4c16f98 100644 --- a/lib/vauth/krb5_gssapi.c +++ b/lib/vauth/krb5_gssapi.c @@ -27,7 +27,7 @@ #if defined(HAVE_GSSAPI) && defined(USE_KERBEROS5) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth/vauth.h" #include "curl_sasl.h" diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c index 1f6e462bf..097914e82 100644 --- a/lib/vauth/krb5_sspi.c +++ b/lib/vauth/krb5_sspi.c @@ -26,7 +26,7 @@ #if defined(USE_WINDOWS_SSPI) && defined(USE_KERBEROS5) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth/vauth.h" #include "urldata.h" diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c index 589cca16c..feebdb0e3 100644 --- a/lib/vauth/ntlm_sspi.c +++ b/lib/vauth/ntlm_sspi.c @@ -24,7 +24,7 @@ #if defined(USE_WINDOWS_SSPI) && defined(USE_NTLM) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth/vauth.h" #include "urldata.h" diff --git a/lib/vauth/oauth2.c b/lib/vauth/oauth2.c index b4e9f8e70..6db148b62 100644 --- a/lib/vauth/oauth2.c +++ b/lib/vauth/oauth2.c @@ -27,7 +27,7 @@ #if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_SMTP) || \ !defined(CURL_DISABLE_POP3) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "vauth/vauth.h" diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c index 5d43e1100..9c3faa4a9 100644 --- a/lib/vauth/spnego_gssapi.c +++ b/lib/vauth/spnego_gssapi.c @@ -26,7 +26,7 @@ #if defined(HAVE_GSSAPI) && defined(USE_SPNEGO) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth/vauth.h" #include "urldata.h" diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c index 4b21cc769..735988480 100644 --- a/lib/vauth/spnego_sspi.c +++ b/lib/vauth/spnego_sspi.c @@ -26,7 +26,7 @@ #if defined(USE_WINDOWS_SSPI) && defined(USE_SPNEGO) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth/vauth.h" #include "urldata.h" diff --git a/lib/vauth/vauth.c b/lib/vauth/vauth.c index a9c5c9c4f..54b34861b 100644 --- a/lib/vauth/vauth.c +++ b/lib/vauth/vauth.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth.h" #include "curl_multibyte.h" diff --git a/lib/vauth/vauth.h b/lib/vauth/vauth.h index 73bd25ed5..8838d9ee4 100644 --- a/lib/vauth/vauth.h +++ b/lib/vauth/vauth.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> struct Curl_easy; diff --git a/lib/version.c b/lib/version.c index 14b0531d3..d938730a1 100644 --- a/lib/version.c +++ b/lib/version.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "vtls/vtls.h" #include "http2.h" diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c index b93ff5d4f..40cd9e1de 100644 --- a/lib/vtls/gskit.c +++ b/lib/vtls/gskit.c @@ -63,7 +63,7 @@ #include <limits.h> -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "gskit.h" diff --git a/lib/warnless.h b/lib/warnless.h index ea4c4395d..08792c2e1 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -23,7 +23,7 @@ ***************************************************************************/ #ifdef USE_WINSOCK -#include <curl/curl.h> /* for curl_socket_t */ +#include <gnurl/curl.h> /* for curl_socket_t */ #endif #define CURLX_FUNCTION_CAST(target_type, func) \ diff --git a/lib/x509asn1.c b/lib/x509asn1.c index ece5364d8..026a76950 100644 --- a/lib/x509asn1.c +++ b/lib/x509asn1.c @@ -25,7 +25,7 @@ #if defined(USE_GSKIT) || defined(USE_NSS) || defined(USE_GNUTLS) || \ defined(USE_WOLFSSL) || defined(USE_SCHANNEL) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "strcase.h" #include "hostcheck.h" |