diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-01-08 19:38:57 +0100 |
|---|---|---|
| committer | ng0 <ng0@infotropique.org> | 2017-08-22 16:07:52 +0000 |
| commit | 20f7f90142ebc0d63886e0879839edcd1d84b4e6 (patch) | |
| tree | f9778469f078254ca8f82f0b874a15205a73aca9 | |
| parent | 6046dfb161d309010150f913a47c108ac97c5538 (diff) | |
| download | gnurl-7_55_1-1.tar.gz gnurl-7_55_1-1.tar.bz2 gnurl-7_55_1-1.zip | |
Patchset for gnURL microfork:gnurl-7_55_1-1
* Patches to rename libcurl to libgnurl by Christian
* Updated for latest curl using git cherry-pick by Jeff, Florian, ng0
* Patches to fix the testsuite (deleted tests/data/test1139, renamed
reference from libcurl.* to libgnurl.*) by ng0
* Added guix-gnurl.scm which can be used to build this with guix prior
to installing it. (author: ng0)
* Further adjustments by ng0
* 7.55.0: Manual addition of a7bbbb7c368c6096802007f61f19a02e9d75285b and f864bd8c880d5a916379aa4f26f1c45fe370b282 from upstream master.
* 7.55.1: Renamed include/curl to include/gnurl, a partial fix of https://gnunet.org/bugs/view.php?id=5122
Signed-off-by: ng0 <ng0@infotropique.org>
149 files changed, 246 insertions, 172 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index af7f4dc40..be3fb4b3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ project( CURL C ) message(WARNING "the curl cmake build system is poorly maintained. Be aware") -file (READ ${CURL_SOURCE_DIR}/include/curl/curlver.h CURL_VERSION_H_CONTENTS) +file (READ ${CURL_SOURCE_DIR}/include/gnurl/curlver.h CURL_VERSION_H_CONTENTS) string (REGEX MATCH "#define LIBCURL_VERSION \"[^\"]*" CURL_VERSION ${CURL_VERSION_H_CONTENTS}) string (REGEX REPLACE "[^\"]+\"" "" CURL_VERSION ${CURL_VERSION}) @@ -69,7 +69,7 @@ message(STATUS "curl version=[${CURL_VERSION}]") set(OPERATING_SYSTEM "${CMAKE_SYSTEM_NAME}") set(OS "\"${CMAKE_SYSTEM_NAME}\"") -include_directories(${PROJECT_BINARY_DIR}/include/curl) +include_directories(${PROJECT_BINARY_DIR}/include/gnurl) include_directories( ${CURL_SOURCE_DIR}/include ) option(CURL_WERROR "Turn compiler warnings into errors" OFF) @@ -1315,7 +1315,7 @@ if(NOT CURL_CONFIG_HAS_BEEN_RUN_BEFORE) endif() # install headers -install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/curl" +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/gnurl" DESTINATION include FILES_MATCHING PATTERN "*.h") diff --git a/Makefile.am b/Makefile.am index 0796fff60..7037d1c84 100644 --- a/Makefile.am +++ b/Makefile.am @@ -143,8 +143,8 @@ WINBUILD_DIST = winbuild/BUILD.WINDOWS.txt winbuild/gen_resp_file.bat \ EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist gnurl-config.in \ RELEASE-NOTES buildconf libgnurl.pc.in MacOSX-Framework scripts/zsh.pl \ - $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) lib/libcurl.vers.in \ - buildconf.bat + scripts/updatemanpages.pl $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) \ + lib/libcurl.vers.in buildconf.bat scripts/coverage.sh CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \ $(VC71_LIBVCPROJ) $(VC71_SRCVCPROJ) $(VC8_LIBVCPROJ) $(VC8_SRCVCPROJ) \ @@ -83,7 +83,7 @@ removethis(){ if test ! -f configure.ac || test ! -f src/tool_main.c || test ! -f lib/urldata.h || - test ! -f include/curl/curl.h || + test ! -f include/gnurl/curl.h || test ! -f m4/curl-functions.m4; then echo "Can not run buildconf from outside of curl's source subdirectory!" echo "Change to the subdirectory where buildconf is found, and try again." @@ -305,7 +305,7 @@ for fname in .deps \ config.sub \ configure \ configurehelp.pm \ - curl-config \ + gnurl-config \ depcomp \ libcares.pc \ libcurl.pc \ diff --git a/configure.ac b/configure.ac index cd3c3ad08..c27c516e4 100644 --- a/configure.ac +++ b/configure.ac @@ -122,7 +122,7 @@ AC_SUBST([AR]) AC_SUBST(libext) dnl figure out the libcurl version -CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)".*/\1/p' ${srcdir}/include/curl/curlver.h` +CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)".*/\1/p' ${srcdir}/include/gnurl/curlver.h` XC_CHECK_PROG_CC XC_AUTOMAKE AC_MSG_CHECKING([curl version]) @@ -132,7 +132,7 @@ AC_SUBST(CURLVERSION) dnl dnl we extract the numerical version for curl-config only -VERSIONNUM=`$SED -ne 's/^#define LIBCURL_VERSION_NUM 0x\([0-9A-Fa-f]*\).*/\1/p' ${srcdir}/include/curl/curlver.h` +VERSIONNUM=`$SED -ne 's/^#define LIBCURL_VERSION_NUM 0x\([0-9A-Fa-f]*\).*/\1/p' ${srcdir}/include/gnurl/curlver.h` AC_SUBST(VERSIONNUM) dnl Solaris pkgadd support definitions @@ -3876,7 +3876,7 @@ AC_CONFIG_FILES([Makefile \ docs/libcurl/opts/Makefile \ docs/cmdline-opts/Makefile \ include/Makefile \ - include/curl/Makefile \ + include/gnurl/Makefile \ src/Makefile \ lib/Makefile \ scripts/Makefile \ diff --git a/docs/Makefile.am b/docs/Makefile.am index 23975fe4a..0cc9b5acf 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -22,10 +22,14 @@ AUTOMAKE_OPTIONS = foreign no-dependencies -man_MANS = gnurl.1 gnurl-config.1 -noinst_man_MANS = mk-ca-bundle.1 +# EXTRA_DIST breaks with $(abs_builddir) so build it using this variable +# but distribute it (using the relative file name) in the next variable +man_MANS = $(abs_builddir)/gnurl.1 +noinst_man_MANS = gnurl.1 mk-ca-bundle.1 +dist_man_MANS = gnurl-config.1 GENHTMLPAGES = gnurl.html gnurl-config.html mk-ca-bundle.html PDFPAGES = gnurl.pdf gnurl-config.pdf mk-ca-bundle.pdf +MANDISTPAGES = gnurl.1.dist gnurl-config.1.dist HTMLPAGES = $(GENHTMLPAGES) index.html diff --git a/docs/examples/10-at-a-time.c b/docs/examples/10-at-a-time.c index 455529182..b0c65b77e 100644 --- a/docs/examples/10-at-a-time.c +++ b/docs/examples/10-at-a-time.c @@ -32,7 +32,7 @@ #ifndef WIN32 # include <unistd.h> #endif -#include <curl/multi.h> +#include <gnurl/multi.h> static const char *urls[] = { "http://www.microsoft.com", diff --git a/docs/gnurl.1 b/docs/gnurl.1 index dfee670e9..797b848f0 100644 --- a/docs/gnurl.1 +++ b/docs/gnurl.1 @@ -258,6 +258,7 @@ See also \fI--cert-type\fP and \fI--key\fP and \fI--key-type\fP. (TLS) Specifies which ciphers to use in the connection. The list of ciphers must specify valid ciphers. Read up on SSL cipher list details on this URL: + https://curl.haxx.se/docs/ssl-ciphers.html If this option is used several times, the last one will be used. @@ -2535,6 +2536,8 @@ FTP weird PASS reply. Curl couldn't parse the reply sent to the PASS request. .IP 12 During an active FTP session while waiting for the server to connect back to curl, the timeout expired. +.IP 11 +FTP weird PASS reply. Curl couldn't parse the reply sent to the PASS request. .IP 13 FTP weird PASV reply, Curl couldn't parse the reply sent to the PASV request. .IP 14 diff --git a/docs/libcurl/Makefile.inc b/docs/libcurl/Makefile.inc index 2f787726c..84a037af5 100644 --- a/docs/libcurl/Makefile.inc +++ b/docs/libcurl/Makefile.inc @@ -5,7 +5,7 @@ man_MANS = curl_easy_cleanup.3 curl_easy_getinfo.3 curl_easy_init.3 \ curl_formadd.3 curl_formfree.3 curl_getdate.3 curl_getenv.3 \ curl_slist_append.3 curl_slist_free_all.3 curl_version.3 \ curl_version_info.3 curl_escape.3 curl_unescape.3 curl_free.3 \ - curl_strequal.3 curl_strnequal.3 curl_mprintf.3 curl_global_init.3 \ + curl_strequal.3 curl_strnequal.3 curl_mprintf.3 curl_global_init.3 \ curl_global_cleanup.3 curl_multi_add_handle.3 curl_multi_cleanup.3 \ curl_multi_fdset.3 curl_multi_info_read.3 curl_multi_init.3 \ curl_multi_perform.3 curl_multi_remove_handle.3 curl_share_cleanup.3 \ diff --git a/docs/libcurl/curl_mprintf.3 b/docs/libcurl/curl_mprintf.3 index e861ed9ce..6ca4e595d 100644 --- a/docs/libcurl/curl_mprintf.3 +++ b/docs/libcurl/curl_mprintf.3 @@ -25,7 +25,7 @@ curl_maprintf, curl_mfprintf, curl_mprintf, curl_msnprintf, curl_msprintf curl_mvaprintf, curl_mvfprintf, curl_mvprintf, curl_mvsnprintf, curl_mvsprintf - formatted output conversion .SH SYNOPSIS -.B #include <curl/mprintf.h> +.B #include <gnurl/mprintf.h> .sp .BI "int curl_mprintf(const char *" format ", ...);" .br diff --git a/guix-gnurl.scm b/guix-gnurl.scm new file mode 100644 index 000000000..f08f17f6d --- /dev/null +++ b/guix-gnurl.scm @@ -0,0 +1,46 @@ +;;; /*************************************************************************** +;;; * +;;; * +;;; * Copyright (C) 2016, 2017 ng0 <ng0@infotropique.org>. +;;; * +;;; * This file is an appendum to gnurl. +;;; * +;;; * This software is licensed as described in the file COPYING, which +;;; * you should have received as part of this distribution. The terms +;;; * are also available at https://curl.haxx.se/docs/copyright.html. +;;; * +;;; * You may opt to use, copy, modify, merge, publish, distribute and/or sell +;;; * copies of the Software, and permit persons to whom the Software is +;;; * furnished to do so, under the terms of the COPYING file. +;;; * +;;; * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +;;; * KIND, either express or implied. +;;; * +;;; ***************************************************************************/ + + +(use-modules + (ice-9 popen) + (ice-9 match) + (ice-9 rdelim) + (guix packages) + (guix build-system gnu) + (guix gexp) + ((guix build utils) #:select (with-directory-excursion)) + (gnu packages) + (gnu packages base) + (gnu packages autotools) + (gnu packages gnunet)) + +(define %source-dir (dirname (current-filename))) + +(define-public gnurl-git + (package + (inherit gnurl) + (name "gnurl-git") + (version (string-append "7.55.1-" "dev")) + (source + (local-file %source-dir + #:recursive? #t)))) + +gnurl-git diff --git a/include/Makefile.am b/include/Makefile.am index 3b2486029..3d036b8ff 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = curl +SUBDIRS = gnurl EXTRA_DIST = README diff --git a/include/README b/include/README index 9e865aa11..0fc8f66d9 100644 --- a/include/README +++ b/include/README @@ -9,7 +9,7 @@ Include files for libcurl, external users. They're all placed in the curl subdirectory here for better fit in any kind of environment. You must include files from here using... - #include <curl/curl.h> + #include <gnurl/curl.h> ... style and point the compiler's include path to the directory holding the curl subdirectory. It makes it more likely to survive future modifications. diff --git a/include/curl/.gitignore b/include/gnurl/.gitignore index 555795fae..555795fae 100644 --- a/include/curl/.gitignore +++ b/include/gnurl/.gitignore diff --git a/include/curl/Makefile.am b/include/gnurl/Makefile.am index 989d4a218..a7c8b47c5 100644 --- a/include/curl/Makefile.am +++ b/include/gnurl/Makefile.am @@ -23,10 +23,29 @@ pkginclude_HEADERS = \ curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \ typecheck-gcc.h system.h -pkgincludedir= $(includedir)/curl +pkgincludedir= $(includedir)/gnurl + +# curlbuild.h does not exist in the git tree. When the original libcurl +# source code distribution archive file is created, curlbuild.h.dist is +# renamed to curlbuild.h and included in the tarball so that it can be +# used directly on non-configure systems. +# +# The distributed curlbuild.h will be overwritten on configure systems +# when the configure script runs, with one that is suitable and specific +# to the library being configured and built. +# +# curlbuild.h.in is the distributed template file from which the configure +# script creates curlbuild.h at library configuration time, overwiting the +# one included in the distribution archive. +# +# curlbuild.h.dist is not included in the source code distribution archive. + +EXTRA_DIST = curlbuild.h.in + +DISTCLEANFILES = curlbuild.h checksrc: - @@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/include/curl $(pkginclude_HEADERS) + @@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/include/gnurl $(pkginclude_HEADERS) if CURLDEBUG # for debug builds, we scan the sources on all regular make invokes diff --git a/include/curl/curl.h b/include/gnurl/curl.h index 82fb8aeb8..82fb8aeb8 100644 --- a/include/curl/curl.h +++ b/include/gnurl/curl.h diff --git a/include/curl/curlver.h b/include/gnurl/curlver.h index 2165d55b1..2165d55b1 100644 --- a/include/curl/curlver.h +++ b/include/gnurl/curlver.h diff --git a/include/curl/easy.h b/include/gnurl/easy.h index 752c5049f..752c5049f 100644 --- a/include/curl/easy.h +++ b/include/gnurl/easy.h diff --git a/include/curl/mprintf.h b/include/gnurl/mprintf.h index e20f546e1..e20f546e1 100644 --- a/include/curl/mprintf.h +++ b/include/gnurl/mprintf.h diff --git a/include/curl/multi.h b/include/gnurl/multi.h index f93e511be..46d979853 100644 --- a/include/curl/multi.h +++ b/include/gnurl/multi.h @@ -40,7 +40,7 @@ /* * This header file should not really need to include "curl.h" since curl.h * itself includes this file and we expect user applications to do #include - * <curl/curl.h> without the need for especially including multi.h. + * <gnurl/curl.h> without the need for especially including multi.h. * * For some reason we added this include here at one point, and rather than to * break existing (wrongly written) libcurl applications, we leave it as-is diff --git a/include/curl/stdcheaders.h b/include/gnurl/stdcheaders.h index 027b6f421..027b6f421 100644 --- a/include/curl/stdcheaders.h +++ b/include/gnurl/stdcheaders.h diff --git a/include/curl/system.h b/include/gnurl/system.h index 95c72d998..95c72d998 100644 --- a/include/curl/system.h +++ b/include/gnurl/system.h diff --git a/include/curl/typecheck-gcc.h b/include/gnurl/typecheck-gcc.h index 74548241b..74548241b 100644 --- a/include/curl/typecheck-gcc.h +++ b/include/gnurl/typecheck-gcc.h diff --git a/lib/Makefile.am b/lib/Makefile.am index 91c17b403..2aa1bb030 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -103,8 +103,8 @@ libgnurl_la_LDFLAGS_EXTRA = libgnurl_la_CFLAGS_EXTRA = @CODE_COVERAGE_RULES@ -libcurl_la_LDFLAGS_EXTRA += $(CODE_COVERAGE_LDFLAGS) -libcurl_la_CFLAGS_EXTRA += $(CODE_COVERAGE_CFLAGS) +libgnurl_la_LDFLAGS_EXTRA += $(CODE_COVERAGE_LDFLAGS) +libgnurl_la_CFLAGS_EXTRA += $(CODE_COVERAGE_CFLAGS) if CURL_LT_SHLIB_USE_VERSION_INFO libgnurl_la_LDFLAGS_EXTRA += $(VERSIONINFO) diff --git a/lib/Makefile.netware b/lib/Makefile.netware index a4ec4c8f3..e36e6515f 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -365,7 +365,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 $< > $@ @@ -702,7 +702,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/conncache.c b/lib/conncache.c index c79d22764..ad5ac41a8 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 652ed9764..cfec87c57 100644 --- a/lib/content_encoding.c +++ b/lib/content_encoding.c @@ -25,7 +25,7 @@ #ifdef HAVE_LIBZ #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "sendf.h" #include "content_encoding.h" #include "strdup.h" diff --git a/lib/cookie.h b/lib/cookie.h index a9a45785c..41c315a82 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 1adf3198a..3da23fda9 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 46d3ada1e..e9224ada5 100644 --- a/lib/curl_fnmatch.c +++ b/lib/curl_fnmatch.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#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 fccf46879..6d024a743 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 c521497b2..629f327ae 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 e78bb5002..3ebd472e0 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_printf.h b/lib/curl_printf.h index 49857cdb0..c35c0dd84 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_rtmp.c b/lib/curl_rtmp.c index 97430647b..6df8e7276 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 bd574b5e2..bd3b2be9e 100644 --- a/lib/curl_sasl.c +++ b/lib/curl_sasl.c @@ -31,7 +31,7 @@ #include "curl_setup.h" -#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 4a3b85c45..faaac8649 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -139,7 +139,7 @@ /* please, do it beyond the point further indicated in this file. */ /* ================================================================ */ -#include <curl/curl.h> +#include <gnurl/curl.h> /* * Ensure that no one is using the old SIZEOF_CURL_OFF_T macro diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c index 11a7120a9..d4a50d927 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 c1624a913..9259c3f4d 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 6168dc119..a261e71f4 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 81d89fc48..af0954855 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 20603bcab..818061d9f 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 66ec38a5e..a1fd22b0d 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" @@ -1002,7 +1002,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 */ CURLcode curl_easy_pause(struct Curl_easy *data, int action) { diff --git a/lib/escape.c b/lib/escape.c index 973aeb6ea..0b8b5317f 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 666cbe75b..acca6ec08 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 c5d0ee5b6..a5ead4685 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 e48a6276c..2d7b6b627 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> #ifndef CURL_DISABLE_HTTP @@ -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 2acce31d8..6063cee6e 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 dc3a107e9..99ba587af 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 836f72550..19b6d36e2 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 6afeaa12c..552022443 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 dae95054b..d7e495e16 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 86e3b96a9..93fe0d049 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 d66b8482f..741098e84 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 a845f564d..c5c7a125d 100644 --- a/lib/http.h +++ b/lib/http.h @@ -96,7 +96,7 @@ CURLcode Curl_http_perhapsrewind(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 0e5580133..6b52171f6 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -2267,7 +2267,7 @@ void Curl_http2_cleanup_dependencies(struct Curl_easy *data) /* Satisfy external references even if http2 is not compiled in. */ #define CURL_DISABLE_TYPECHECK -#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 36567d36f..834733960 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 48af2902a..8fa598f88 100644 --- a/lib/imap.c +++ b/lib/imap.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" diff --git a/lib/ldap.c b/lib/ldap.c index 435b990ab..9b85a4815 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -64,7 +64,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 3316fba19..0afccd819 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 0x09,0x01 diff --git a/lib/llist.c b/lib/llist.c index 4bb0a51b8..7fd6637d4 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 8c9fe9502..65b20e5d0 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/mprintf.c b/lib/mprintf.c index eb7ee0c6b..68545bfac 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 d5bc532ea..1f8dfc5ce 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 6e4858b3f..e7afdbd44 100644 --- a/lib/netrc.c +++ b/lib/netrc.c @@ -26,7 +26,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 ae0097036..8fd0437dc 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 98cdc25ab..3445752b9 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 369309cf5..1b32d1f22 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 609fd5363..c39add846 100644 --- a/lib/parsedate.c +++ b/lib/parsedate.c @@ -79,7 +79,7 @@ #include <limits.h> #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "strcase.h" #include "warnless.h" #include "parsedate.h" diff --git a/lib/pipeline.c b/lib/pipeline.c index 4d41b0413..c0917c79f 100644 --- a/lib/pipeline.c +++ b/lib/pipeline.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/pop3.c b/lib/pop3.c index 5792a4a6f..c1ba15908 100644 --- a/lib/pop3.c +++ b/lib/pop3.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/rand.c b/lib/rand.c index 2713a0aa3..69a8576dd 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 9bd935fd5..8b895ed64 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 f6fecaf51..dd2a2c284 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 595c36177..6a472fb47 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#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 5b3957fcf..3b2f7fdfc 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 "vtls/vtls.h" diff --git a/lib/share.h b/lib/share.h index c039a16cb..59a4a14f0 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 "urldata.h" diff --git a/lib/slist.c b/lib/slist.c index e5adc0e71..9e5df832b 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 4e2c3361e..9f9bd1485 100644 --- a/lib/smtp.c +++ b/lib/smtp.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/speedcheck.c b/lib/speedcheck.c index fe669f11a..4d9eb12e9 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" @@ -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/strcase.c b/lib/strcase.c index a74a4be57..c4a06bedb 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 ea2abc8b6..64615d8fd 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 136b69377..8d6258e81 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 83a96dda1..42e22ee4e 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 cfbbf3279..d292bd6e1 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" /* The last #include files should be: */ diff --git a/lib/telnet.c b/lib/telnet.c index 3dec95907..8ef121fec 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 f6f4bce5b..51642c9b9 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 3537b58c6..f09985def 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" @@ -929,7 +929,7 @@ CURLcode Curl_setopt(struct Curl_easy *data, CURLoption option, case CURLOPT_TIMECONDITION: /* * Set HTTP time condition. This must be one of the defines in the - * curl/curl.h header file. + * gnurl/curl.h header file. */ data->set.timecondition = (curl_TimeCond)va_arg(param, long); break; @@ -1343,7 +1343,7 @@ CURLcode Curl_setopt(struct Curl_easy *data, CURLoption option, case CURLOPT_HTTP_VERSION: /* * This sets a requested HTTP version to be used. The value is one of - * the listed enums in curl/curl.h. + * the listed enums in gnurl/curl.h. */ arg = va_arg(param, long); #ifndef USE_NGHTTP2 diff --git a/lib/urldata.h b/lib/urldata.h index b4f18e7da..5f61dde33 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -165,7 +165,7 @@ #endif #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "http_chunks.h" /* for the structs and enum stuff */ #include "hostip.h" diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c index a761ae784..25364579e 100644 --- a/lib/vauth/cleartext.c +++ b/lib/vauth/cleartext.c @@ -25,7 +25,7 @@ #include "curl_setup.h" -#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 3074a163a..5d6126cfa 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 185098ed6..0ae736c83 100644 --- a/lib/vauth/digest.c +++ b/lib/vauth/digest.c @@ -26,7 +26,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 5722dcece..d0ea27778 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 f5d619c99..3d583e417 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 560ecc5bc..bb9a94a4d 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 1b4cef486..afff1dae9 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 c3305176d..227d6de50 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 6288f89a3..28f64e105 100644 --- a/lib/vauth/oauth2.c +++ b/lib/vauth/oauth2.c @@ -24,7 +24,7 @@ #include "curl_setup.h" -#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 5196c2704..04d238b9a 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 a6797cdaf..b1b04aadf 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 b995f34e2..9d17ae8c2 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 9d61228c3..24b7d24d8 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 3d1776813..9207c3384 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/axtls.h b/lib/vtls/axtls.h index 53797eadb..4e5994666 100644 --- a/lib/vtls/axtls.h +++ b/lib/vtls/axtls.h @@ -24,7 +24,7 @@ ***************************************************************************/ #ifdef USE_AXTLS -#include "curl/curl.h" +#include "gnurl/curl.h" #include "urldata.h" int Curl_axtls_init(void); diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c index bf75bddc2..565f10f07 100644 --- a/lib/vtls/gskit.c +++ b/lib/vtls/gskit.c @@ -65,7 +65,7 @@ # include <limits.h> #endif -#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 ab6d29998..5905cb7e3 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 unsigned short curlx_ultous(unsigned long ulnum); diff --git a/lib/wildcard.h b/lib/wildcard.h index 8a5e4b769..89d965ccf 100644 --- a/lib/wildcard.h +++ b/lib/wildcard.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> #include "llist.h" diff --git a/lib/x509asn1.c b/lib/x509asn1.c index bba20233f..aabf6e8c7 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_CYASSL) || defined(USE_SCHANNEL) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "strcase.h" #include "hostcheck.h" @@ -59,7 +59,7 @@ find . -name "*.dist" -a ! -name Makefile.dist -exec rm {} \; numeric=`perl -e 'printf("%02x%02x%02x\n", '"$major, $minor, $patch);"` -HEADER=include/curl/curlver.h +HEADER=include/gnurl/curlver.h CHEADER=src/tool_version.h PLIST=lib/libcurl.plist diff --git a/packages/EPM/curl.list.in b/packages/EPM/curl.list.in index 3a2028b80..0311bc726 100644 --- a/packages/EPM/curl.list.in +++ b/packages/EPM/curl.list.in @@ -52,9 +52,9 @@ f 0755 cowo pppusers ${libdir}/libcurl.la ./lib/.libs/libcurl.la f 0644 cowo pppusers ${libdir}/libcurl.a ./lib/.libs/libcurl.a f 0755 cowo pppusers ${bindir}/curl ./src/curl f 0755 cowo pppusers ${bindir}/curl ./src/.libs/curl -f 0644 cowo pppusers ${includedir}/curl/curl.h ./include/curl/curl.h -f 0644 cowo pppusers ${includedir}/curl/easy.h ./include/curl/easy.h -f 0644 cowo pppusers ${includedir}/curl/mprintf.h ./include/curl/mprintf.h -f 0644 cowo pppusers ${includedir}/curl/stdcheaders.h ./include/curl/stdcheaders.h -f 0644 cowo pppusers ${includedir}/curl/types.h ./include/curl/types.h +f 0644 cowo pppusers ${includedir}/gnurl/curl.h ./include/gnurl/curl.h +f 0644 cowo pppusers ${includedir}/gnurl/easy.h ./include/gnurl/easy.h +f 0644 cowo pppusers ${includedir}/gnurl/mprintf.h ./include/gnurl/mprintf.h +f 0644 cowo pppusers ${includedir}/gnurl/stdcheaders.h ./include/gnurl/stdcheaders.h +f 0644 cowo pppusers ${includedir}/gnurl/types.h ./include/gnurl/types.h f 0755 cowo pppusers ${bindir}/curl-config ./curl-config diff --git a/packages/OS400/initscript.sh b/packages/OS400/initscript.sh index a13d651bc..c9932c49b 100644 --- a/packages/OS400/initscript.sh +++ b/packages/OS400/initscript.sh @@ -73,22 +73,22 @@ setenv LIBSSH2_BNDDIR 'LIBSSH2_A' # LIBSSH2 binding directory. # Need to get the version definitions. LIBCURL_VERSION=`grep '^#define *LIBCURL_VERSION ' \ - "${TOPDIR}/include/curl/curlver.h" | + "${TOPDIR}/include/gnurl/curlver.h" | sed 's/.*"\(.*\)".*/\1/'` LIBCURL_VERSION_MAJOR=`grep '^#define *LIBCURL_VERSION_MAJOR ' \ - "${TOPDIR}/include/curl/curlver.h" | + "${TOPDIR}/include/gnurl/curlver.h" | sed 's/^#define *LIBCURL_VERSION_MAJOR *\([^ ]*\).*/\1/'` LIBCURL_VERSION_MINOR=`grep '^#define *LIBCURL_VERSION_MINOR ' \ - "${TOPDIR}/include/curl/curlver.h" | + "${TOPDIR}/include/gnurl/curlver.h" | sed 's/^#define *LIBCURL_VERSION_MINOR *\([^ ]*\).*/\1/'` LIBCURL_VERSION_PATCH=`grep '^#define *LIBCURL_VERSION_PATCH ' \ - "${TOPDIR}/include/curl/curlver.h" | + "${TOPDIR}/include/gnurl/curlver.h" | sed 's/^#define *LIBCURL_VERSION_PATCH *\([^ ]*\).*/\1/'` LIBCURL_VERSION_NUM=`grep '^#define *LIBCURL_VERSION_NUM ' \ - "${TOPDIR}/include/curl/curlver.h" | + "${TOPDIR}/include/gnurl/curlver.h" | sed 's/^#define *LIBCURL_VERSION_NUM *0x\([^ ]*\).*/\1/'` LIBCURL_TIMESTAMP=`grep '^#define *LIBCURL_TIMESTAMP ' \ - "${TOPDIR}/include/curl/curlver.h" | + "${TOPDIR}/include/gnurl/curlver.h" | sed 's/.*"\(.*\)".*/\1/'` export LIBCURL_VERSION export LIBCURL_VERSION_MAJOR LIBCURL_VERSION_MINOR LIBCURL_VERSION_PATCH @@ -190,7 +190,7 @@ make_module() CMD="${CMD} SYSIFCOPT(*IFS64IO) OPTION(*INCDIRFIRST)" CMD="${CMD} LOCALETYPE(*LOCALE) FLAG(10)" CMD="${CMD} INCDIR('/qibm/proddata/qadrt/include'" - CMD="${CMD} '${TOPDIR}/include/curl' '${TOPDIR}/include' '${SRCDIR}'" + CMD="${CMD} '${TOPDIR}/include/gnurl' '${TOPDIR}/include' '${SRCDIR}'" CMD="${CMD} '${TOPDIR}/packages/OS400'" if [ "${WITH_ZLIB}" != "0" ] diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index de188be66..6e50d82ad 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -56,7 +56,7 @@ source_group("curl header files" FILES ${CURL_HFILES}) include_directories( ${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/curl.h" + ${CURL_BINARY_DIR}/include # To be able to reach "gnurl/curl.h" # This is needed as tool_hugehelp.c is generated in the binary dir ${CURL_SOURCE_DIR}/src # To be able to reach "tool_hugehelp.h" ) diff --git a/src/Makefile.am b/src/Makefile.am index bac903b65..63df6ddc3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -68,10 +68,9 @@ endif gnurl_LDFLAGS = @LIBMETALINK_LDFLAGS@ gnurl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS) -gnurl_DEPENDENCIES = $(top_builddir)/lib/libgnurl.la @CODE_COVERAGE_RULES@ -curl_LDFLAGS += $(CODE_COVERAGE_LDFLAGS) +gnurl_LDFLAGS += $(CODE_COVERAGE_LDFLAGS) CFLAGS += $(CODE_COVERAGE_CFLAGS) # if unit tests are enabled, build a static library to link them with @@ -94,7 +93,10 @@ EXTRA_DIST = mkhelp.pl makefile.dj Makefile.b32 \ macos/src/curl_GUSIConfig.cpp macos/src/macos_main.cpp makefile.amiga \ curl.rc Makefile.netware Makefile.inc Makefile.Watcom CMakeLists.txt -MANPAGE=$(top_srcdir)/docs/gnurl.1 +# Use absolute directory to disable VPATH +MANPAGE=$(abs_top_builddir)/docs/gnurl.1 + +>>>>>>> Patchset for gnURL microfork: README=$(top_srcdir)/docs/MANUAL MKHELP=$(top_srcdir)/src/mkhelp.pl HUGE=tool_hugehelp.c diff --git a/src/Makefile.netware b/src/Makefile.netware index b4d0d6901..975551e0a 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -395,7 +395,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 $< > $@ diff --git a/src/tool_easysrc.c b/src/tool_easysrc.c index c2dccf9fb..e3c9d1aa1 100644 --- a/src/tool_easysrc.c +++ b/src/tool_easysrc.c @@ -50,7 +50,7 @@ static const char *const srchead[]={ " * All curl_easy_setopt() options are documented at:", " * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html", " ************************************************************************/", - "#include <curl/curl.h>", + "#include <gnurl/curl.h>", "", "int main(int argc, char *argv[])", "{", diff --git a/src/tool_setup.h b/src/tool_setup.h index 90b01d7e9..2b2b9527b 100644 --- a/src/tool_setup.h +++ b/src/tool_setup.h @@ -39,7 +39,7 @@ * curl tool certainly uses libcurl's external interface. */ -#include <curl/curl.h> /* external interface */ +#include <gnurl/curl.h> /* external interface */ /* * Platform specific stuff. diff --git a/src/tool_version.h b/src/tool_version.h index 04f45671e..b18a852ea 100644 --- a/src/tool_version.h +++ b/src/tool_version.h @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include <curl/curlver.h> +#include <gnurl/curlver.h> #define CURL_NAME "curl" #define CURL_COPYRIGHT LIBCURL_COPYRIGHT diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index a6cc1cde1..103036040 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -120,7 +120,7 @@ test1112 test1113 test1114 test1115 test1116 test1117 test1118 test1119 \ test1120 test1121 test1122 test1123 test1124 test1125 test1126 test1127 \ test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \ test1136 test1137 test1138 test1140 test1141 test1142 test1143 \ -test1144 \ +test1144 test1145 test1146 test1147 test1148 \ test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \ test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \ test1216 test1217 test1218 test1219 \ diff --git a/tests/data/test1400 b/tests/data/test1400 index 0cef18dfd..194c99c85 100644 --- a/tests/data/test1400 +++ b/tests/data/test1400 @@ -60,7 +60,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/ * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1401 b/tests/data/test1401 index 2217ed8c1..deb1b5ed8 100644 --- a/tests/data/test1401 +++ b/tests/data/test1401 @@ -67,7 +67,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/ * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1402 b/tests/data/test1402 index d2b05f562..8fece3afe 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -65,7 +65,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/ * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1403 b/tests/data/test1403 index b08728314..8e20fafdf 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -62,7 +62,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/ * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1404 b/tests/data/test1404 index c86d2602c..4265bf882 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -97,7 +97,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/ * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1405 b/tests/data/test1405 index f3ad3e795..50bfeb21a 100644 --- a/tests/data/test1405 +++ b/tests/data/test1405 @@ -63,7 +63,7 @@ QUIT * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1406 b/tests/data/test1406 index 033957f60..680f6a25e 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -62,7 +62,7 @@ body * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1407 b/tests/data/test1407 index 5a3de1b17..bb4c4f128 100644 --- a/tests/data/test1407 +++ b/tests/data/test1407 @@ -49,7 +49,7 @@ QUIT * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1420 b/tests/data/test1420 index 38139e0b0..1c98d2c28 100644 --- a/tests/data/test1420 +++ b/tests/data/test1420 @@ -55,7 +55,7 @@ A005 LOGOUT * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/extern-scan.pl b/tests/extern-scan.pl index 88594ed69..1b22410f5 100755 --- a/tests/extern-scan.pl +++ b/tests/extern-scan.pl @@ -30,10 +30,10 @@ use warnings; my $root=$ARGV[0] || "."; my @incs = ( - "$root/include/curl/curl.h", - "$root/include/curl/easy.h", - "$root/include/curl/mprintf.h", - "$root/include/curl/multi.h", + "$root/include/gnurl/curl.h", + "$root/include/gnurl/easy.h", + "$root/include/gnurl/mprintf.h", + "$root/include/gnurl/multi.h", ); my $verbose=0; diff --git a/tests/fuzz/curl_fuzzer.c b/tests/fuzz/curl_fuzzer.c index 2ccf1b36e..be70e4dba 100644 --- a/tests/fuzz/curl_fuzzer.c +++ b/tests/fuzz/curl_fuzzer.c @@ -31,7 +31,7 @@ #include <sys/types.h> #include <unistd.h> -#include <curl/curl.h> +#include <gnurl/curl.h> static const void *cur_data; static int cur_size = -1; diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt index 4d42aa513..db0aed694 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -7,7 +7,7 @@ function(SETUP_TEST TEST_NAME) # ARGN are the files in the test include_directories( ${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/curl.h" + ${CURL_BINARY_DIR}/include # To be able to reach "gnurl/curl.h" ${CURL_SOURCE_DIR}/tests/libtest # To be able to build generated tests ) if(USE_ARES) @@ -52,10 +52,10 @@ endif() add_custom_command( OUTPUT lib1521.c - COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/mk-lib1521.pl < ${CMAKE_SOURCE_DIR}/include/curl/curl.h > lib1521.c + COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/mk-lib1521.pl < ${CMAKE_SOURCE_DIR}/include/gnurl/curl.h > lib1521.c DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/mk-lib1521.pl" - "${CMAKE_SOURCE_DIR}/include/curl/curl.h" + "${CMAKE_SOURCE_DIR}/include/gnurl/curl.h" VERBATIM) # # files used only in some libcurl test programs diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index 85c668b85..6ebad89c8 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -109,8 +109,8 @@ libhostname_la_SOURCES = sethostname.c sethostname.h libhostname_la_LIBADD = libhostname_la_DEPENDENCIES = -lib1521.c: $(top_srcdir)/tests/libtest/mk-lib1521.pl $(top_srcdir)/include/curl/curl.h - @PERL@ $(top_srcdir)/tests/libtest/mk-lib1521.pl < $(top_srcdir)/include/curl/curl.h > lib1521.c +lib1521.c: $(top_srcdir)/tests/libtest/mk-lib1521.pl $(top_srcdir)/include/gnurl/curl.h + @PERL@ $(top_srcdir)/tests/libtest/mk-lib1521.pl < $(top_srcdir)/include/gnurl/curl.h > lib1521.c checksrc: @PERL@ $(top_srcdir)/lib/checksrc.pl $(srcdir)/*.c diff --git a/tests/libtest/lib1550.c b/tests/libtest/lib1550.c index 94ee576ca..5c2fb6f6a 100644 --- a/tests/libtest/lib1550.c +++ b/tests/libtest/lib1550.c @@ -23,7 +23,7 @@ #include "memdebug.h" -#include <curl/multi.h> +#include <gnurl/multi.h> int test(char *URL) { diff --git a/tests/libtest/lib1551.c b/tests/libtest/lib1551.c index 16e27275a..e3ff3b313 100644 --- a/tests/libtest/lib1551.c +++ b/tests/libtest/lib1551.c @@ -23,7 +23,7 @@ #include "memdebug.h" -#include <curl/multi.h> +#include <gnurl/multi.h> int test(char *URL) { diff --git a/tests/libtest/mk-lib1521.pl b/tests/libtest/mk-lib1521.pl index e60bce5cc..a75fad928 100644 --- a/tests/libtest/mk-lib1521.pl +++ b/tests/libtest/mk-lib1521.pl @@ -22,7 +22,7 @@ ########################################################################### # Usage: -# perl mk-lib1521.pl < ../../include/curl/curl.h > lib1521.c +# perl mk-lib1521.pl < ../../include/gnurl/curl.h > lib1521.c # minimum and maximum long signed values my $minlong = "LONG_MIN"; diff --git a/tests/libtest/test.h b/tests/libtest/test.h index bb1acca0e..90735d272 100644 --- a/tests/libtest/test.h +++ b/tests/libtest/test.h @@ -31,7 +31,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #ifdef HAVE_SYS_SELECT_H /* since so many tests use select(), we can just as well include it here */ diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c index f3ad0ce58..78b1a2b65 100644 --- a/tests/libtest/testutil.c +++ b/tests/libtest/testutil.c @@ -20,7 +20,7 @@ * ***************************************************************************/ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "testutil.h" #include "memdebug.h" diff --git a/tests/manpage-scan.pl b/tests/manpage-scan.pl index b6864c857..a9d960727 100644 --- a/tests/manpage-scan.pl +++ b/tests/manpage-scan.pl @@ -43,7 +43,7 @@ use warnings; my $root=$ARGV[0] || "."; my $buildroot=$ARGV[1] || "."; my $syms = "$root/docs/libcurl/symbols-in-versions"; -my $curlh = "$root/include/curl/curl.h"; +my $curlh = "$root/include/gnurl/curl.h"; my $errors=0; # the prepopulated alias list is the CURLINFO_* defines that are used for the diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index cfc1434cd..39c145007 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -11,7 +11,7 @@ function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test include_directories( ${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/curl.h" + ${CURL_BINARY_DIR}/include # To be able to reach "gnurl/curl.h" ) if(USE_ARES) include_directories(${CARES_INCLUDE_DIR}) diff --git a/tests/symbol-scan.pl b/tests/symbol-scan.pl index 5d570d8a8..1700ca33a 100644 --- a/tests/symbol-scan.pl +++ b/tests/symbol-scan.pl @@ -51,8 +51,8 @@ my $root=$ARGV[0] || "."; # need an include directory when building out-of-tree my $i = ($ARGV[1]) ? "-I$ARGV[1] " : ''; -my $h = "$root/include/curl/curl.h"; -my $mh = "$root/include/curl/multi.h"; +my $h = "$root/include/gnurl/curl.h"; +my $mh = "$root/include/gnurl/multi.h"; my $verbose=0; my $summary=0; diff --git a/tests/testcurl.pl b/tests/testcurl.pl index 9749bc7d1..48fde3dcf 100755 --- a/tests/testcurl.pl +++ b/tests/testcurl.pl @@ -503,8 +503,8 @@ if ($git) { } # Set timestamp to the one in curlver.h if this isn't a git test build. -if ((-f "include/curl/curlver.h") && - (open(F, "<include/curl/curlver.h"))) { +if ((-f "include/gnurl/curlver.h") && + (open(F, "<include/gnurl/curlver.h"))) { while (<F>) { chomp; if ($_ =~ /^\#define\s+LIBCURL_TIMESTAMP\s+\"(.+)\".*$/) { diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index a29991215..ea265b3e5 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -29,7 +29,7 @@ include_directories( ${CURL_SOURCE_DIR}/tests/libtest ${CURL_SOURCE_DIR}/src ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h" - ${CURL_BINARY_DIR}/include # To be able to reach "curl/curl.h" + ${CURL_BINARY_DIR}/include # To be able to reach "gnurl/curl.h" ) foreach(_testfile ${UT_SRC}) diff --git a/tests/unit/unit1308.c b/tests/unit/unit1308.c index 5c1a00867..4cd384877 100644 --- a/tests/unit/unit1308.c +++ b/tests/unit/unit1308.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curlcheck.h" -#include <curl/curl.h> +#include <gnurl/curl.h> static CURLcode unit_setup(void) { diff --git a/tests/unit/unit1398.c b/tests/unit/unit1398.c index 9491c46c5..095242b07 100644 --- a/tests/unit/unit1398.c +++ b/tests/unit/unit1398.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curlcheck.h" -#include "curl/mprintf.h" +#include "gnurl/mprintf.h" static CURLcode unit_setup(void) {return CURLE_OK;} static void unit_stop(void) {} |