Date: Thursday, August 10, 2017 @ 15:12:17 Author: dreisner Revision: 301843
upgpkg: curl 7.55.0-1 Modified: curl/trunk/PKGBUILD Deleted: curl/trunk/includes-remove-curl-curlbuild.h-and-curl-curlrules.patch -----------------------------------------------------------+ PKGBUILD | 21 includes-remove-curl-curlbuild.h-and-curl-curlrules.patch | 2748 ------------ 2 files changed, 5 insertions(+), 2764 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-08-10 13:18:16 UTC (rev 301842) +++ PKGBUILD 2017-08-10 15:12:17 UTC (rev 301843) @@ -6,8 +6,8 @@ # Contributor: Daniel J Griffiths <ghost1...@archlinux.us> pkgname=curl -pkgver=7.54.1 -pkgrel=2 +pkgver=7.55.0 +pkgrel=1 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64') url="https://curl.haxx.se" @@ -15,23 +15,12 @@ depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl' 'libnghttp2') provides=('libcurl.so') options=('strip' 'debug') -source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - includes-remove-curl-curlbuild.h-and-curl-curlrules.patch) -sha512sums=('59c236f46e13faf9124cecab991b139e57376b1b5a5db13005f55ffece67191f0f7ecb954ae14e382a561d34f8b652b532755746d0cda79713b56857833951c5' - 'SKIP' - 'd18b92c4998ca1490c2946fae123e665e8cd25419a53d9ddcd1eb95d95db9eb16757989ec65e8590d60eec249c185450f1e0537acd508f140f1851896185cc39') +source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}) +sha512sums=('5c69f35419ca60b79fbf7b887a49be1b92aba4177f90fa32132b0849207443de34423bb7c1fd0ab5c59bbea8791b80805d8095bee665027258d73a281f14aef8' + 'SKIP') validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2' # Daniel Stenberg '914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg (old key) -prepare() { - cd "$pkgname-$pkgver" - - # Fix FS#53862 , merged upstream - patch -Np1 -i ../includes-remove-curl-curlbuild.h-and-curl-curlrules.patch - - autoreconf -fiv -} - build() { cd "$pkgname-$pkgver" Deleted: includes-remove-curl-curlbuild.h-and-curl-curlrules.patch =================================================================== --- includes-remove-curl-curlbuild.h-and-curl-curlrules.patch 2017-08-10 13:18:16 UTC (rev 301842) +++ includes-remove-curl-curlbuild.h-and-curl-curlrules.patch 2017-08-10 15:12:17 UTC (rev 301843) @@ -1,2748 +0,0 @@ -From 73a2fcea0b4adea6ba342cd7ed1149782c214ae3 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <dan...@haxx.se> -Date: Mon, 22 May 2017 09:05:10 +0200 -Subject: [PATCH] includes: remove curl/curlbuild.h and curl/curlrules.h - -Rely entirely on curl/system.h now. - -Introduced in Aug 2008 with commit 14240e9e109f. Now gone. - -Fixes #1456 ---- - CMakeLists.txt | 14 +- - MacOSX-Framework | 9 - - Makefile.am | 2 +- - acinclude.m4 | 18 +- - buildconf | 1 - - buildconf.bat | 35 +- - configure.ac | 7 +- - docs/FAQ | 27 -- - docs/INSTALL.cmake | 11 - - docs/examples/Makefile.am | 8 +- - include/README | 26 +- - include/curl/.gitignore | 1 - - include/curl/Makefile.am | 23 +- - include/curl/curl.h | 2 - - include/curl/curlbuild.h.cmake | 197 ---------- - include/curl/curlbuild.h.dist | 586 ---------------------------- - include/curl/curlbuild.h.in | 197 ---------- - include/curl/curlrules.h | 239 ------------ - include/curl/system.h | 646 ++++++++++++++++--------------- - lib/CMakeLists.txt | 3 - - lib/Makefile.Watcom | 8 +- - lib/Makefile.am | 6 +- - lib/Makefile.m32 | 11 +- - lib/Makefile.netware | 42 +- - lib/curl_setup.h | 4 +- - lib/makefile.dj | 5 +- - packages/Android/Android.mk | 3 +- - packages/OS400/make-include.sh | 9 - - packages/OS400/os400sys.c | 4 +- - packages/vms/clean_gnv_curl.com | 6 - - packages/vms/pcsi_gnv_curl_file_list.txt | 3 +- - packages/vms/stage_curl_install.com | 8 +- - src/CMakeLists.txt | 2 +- - src/Makefile.am | 6 +- - tests/data/Makefile.inc | 3 +- - tests/data/test1541 | 22 -- - tests/libtest/CMakeLists.txt | 2 +- - tests/libtest/Makefile.am | 10 +- - tests/libtest/Makefile.inc | 6 +- - tests/libtest/lib1541.c | 129 ------ - tests/server/CMakeLists.txt | 2 +- - tests/server/Makefile.am | 10 +- - tests/testcurl.pl | 17 +- - tests/unit/CMakeLists.txt | 2 +- - tests/unit/Makefile.am | 12 +- - winbuild/Makefile.vc | 3 - - 46 files changed, 390 insertions(+), 1997 deletions(-) - delete mode 100644 include/curl/curlbuild.h.cmake - delete mode 100644 include/curl/curlbuild.h.dist - delete mode 100644 include/curl/curlbuild.h.in - delete mode 100644 include/curl/curlrules.h - delete mode 100644 tests/data/test1541 - delete mode 100644 tests/libtest/lib1541.c - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d2e1c2bb6..85ef04104 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,7 +5,7 @@ - # | (__| |_| | _ <| |___ - # \___|\___/|_| \_\_____| - # --# Copyright (C) 1998 - 2016, Daniel Stenberg, <dan...@haxx.se>, et al. -+# Copyright (C) 1998 - 2017, Daniel Stenberg, <dan...@haxx.se>, et al. - # - # This software is licensed as described in the file COPYING, which - # you should have received as part of this distribution. The terms -@@ -1111,7 +1111,7 @@ else() - set(CURL_SIZEOF_CURL_SOCKLEN_T ${SIZEOF_INT}) - endif() - --# TODO test which of these headers are required for the typedefs used in curlbuild.h -+# TODO test which of these headers are required - if(WIN32) - set(CURL_PULL_WS2TCPIP_H ${HAVE_WS2TCPIP_H}) - else() -@@ -1297,16 +1297,10 @@ if(NOT CURL_CONFIG_HAS_BEEN_RUN_BEFORE) - set(CURL_CONFIG_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether this is the first time running CMake or if CMake has been configured before") - endif() - --# Installation. --# First, install generated curlbuild.h --install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/curl/curlbuild.h" -- DESTINATION include/curl ) --# Next, install other headers excluding curlbuild.h -+# install headers - install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/curl" - DESTINATION include -- FILES_MATCHING PATTERN "*.h" -- PATTERN "curlbuild.h" EXCLUDE) -- -+ FILES_MATCHING PATTERN "*.h") - - # Workaround for MSVS10 to avoid the Dialog Hell - # FIXME: This could be removed with future version of CMake. -diff --git a/MacOSX-Framework b/MacOSX-Framework -index 19b338f1d..e6badcde5 100755 ---- a/MacOSX-Framework -+++ b/MacOSX-Framework -@@ -126,15 +126,6 @@ if test ! -z $SDK32; then - pwd - lipo libcurl.framework/${FRAMEWORK_VERSION}/libcurl32 libcurl.framework/${FRAMEWORK_VERSION}/libcurl64 -create -output libcurl.framework/${FRAMEWORK_VERSION}/libcurl - rm libcurl.framework/${FRAMEWORK_VERSION}/libcurl32 libcurl.framework/${FRAMEWORK_VERSION}/libcurl64 -- cp libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl/curlbuild.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl/curlbuild32.h -- cp include/curl/curlbuild.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl/curlbuild64.h -- cat >libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl/curlbuild.h <<EOF --#ifdef __LP64__ --#include "curl/curlbuild64.h" --#else --#include "curl/curlbuild32.h" --#endif --EOF - fi - - pwd -diff --git a/Makefile.am b/Makefile.am -index 6c1d9edff..5ebc7ee98 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -27,7 +27,7 @@ ACLOCAL_AMFLAGS = -I m4 - CMAKE_DIST = CMakeLists.txt CMake/CMakeConfigurableFile.in \ - CMake/CurlTests.c CMake/FindGSS.cmake CMake/OtherTests.cmake \ - CMake/Platforms/WindowsCache.cmake CMake/Utilities.cmake \ -- include/curl/curlbuild.h.cmake CMake/Macros.cmake \ -+ CMake/Macros.cmake \ - CMake/CurlSymbolHiding.cmake CMake/FindCARES.cmake \ - CMake/FindLibSSH2.cmake CMake/FindNGHTTP2.cmake \ - CMake/FindMbedTLS.cmake -diff --git a/acinclude.m4 b/acinclude.m4 -index 2abae8d8a..1e1cf790c 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -5,7 +5,7 @@ - # | (__| |_| | _ <| |___ - # \___|\___/|_| \_\_____| - # --# Copyright (C) 1998 - 2016, Daniel Stenberg, <dan...@haxx.se>, et al. -+# Copyright (C) 1998 - 2017, Daniel Stenberg, <dan...@haxx.se>, et al. - # - # This software is licensed as described in the file COPYING, which - # you should have received as part of this distribution. The terms -@@ -2079,10 +2079,7 @@ _EOF - dnl CURL_CONFIGURE_LONG - dnl ------------------------------------------------- - dnl Find out the size of long as reported by sizeof() and define --dnl CURL_SIZEOF_LONG as appropriate to be used in template file --dnl include/curl/curlbuild.h.in to properly configure the library. --dnl The size of long is a build time characteristic and as such --dnl must be recorded in curlbuild.h -+dnl CURL_SIZEOF_LONG. - - AC_DEFUN([CURL_CONFIGURE_LONG], [ - if test -z "$ac_cv_sizeof_long" || -@@ -2095,10 +2092,6 @@ AC_DEFUN([CURL_CONFIGURE_LONG], [ - - dnl CURL_CONFIGURE_CURL_SOCKLEN_T - dnl ------------------------------------------------- --dnl Find out suitable curl_socklen_t data type definition and size, making --dnl appropriate definitions for template file include/curl/curlbuild.h.in --dnl to properly configure and use the library. --dnl - dnl The need for the curl_socklen_t definition arises mainly to properly - dnl interface HP-UX systems which on one hand have a typedef'ed socklen_t - dnl data type which is 32 or 64-Bit wide depending on the data model being -@@ -2222,10 +2215,6 @@ AC_DEFUN([CURL_CONFIGURE_CURL_SOCKLEN_T], [ - - dnl CURL_CONFIGURE_PULL_SYS_POLL - dnl ------------------------------------------------- --dnl Find out if system header file sys/poll.h must be included by the --dnl external interface, making appropriate definitions for template file --dnl include/curl/curlbuild.h.in to properly configure and use the library. --dnl - dnl The need for the sys/poll.h inclusion arises mainly to properly - dnl interface AIX systems which define macros 'events' and 'revents'. - -@@ -2859,8 +2848,7 @@ AC_DEFUN([DO_CURL_OFF_T_SUFFIX_CHECK], [ - dnl CURL_CONFIGURE_CURL_OFF_T - dnl ------------------------------------------------- - dnl Find out suitable curl_off_t data type definition and associated --dnl items, and make the appropriate definitions used in template file --dnl include/curl/curlbuild.h.in to properly configure the library. -+dnl items - - AC_DEFUN([CURL_CONFIGURE_CURL_OFF_T], [ - AC_REQUIRE([CURL_INCLUDES_INTTYPES])dnl -diff --git a/buildconf b/buildconf -index 940559652..509575312 100755 ---- a/buildconf -+++ b/buildconf -@@ -306,7 +306,6 @@ for fname in .deps \ - configure \ - configurehelp.pm \ - curl-config \ -- curlbuild.h \ - depcomp \ - libcares.pc \ - libcurl.pc \ -diff --git a/buildconf.bat b/buildconf.bat -index ad3fba6bc..da5c0391a 100644 ---- a/buildconf.bat -+++ b/buildconf.bat -@@ -6,7 +6,7 @@ rem * / __| | | | |_) | | - rem * | (__| |_| | _ <| |___ - rem * \___|\___/|_| \_\_____| - rem * --rem * Copyright (C) 1998 - 2016, Daniel Stenberg, <dan...@haxx.se>, et al. -+rem * Copyright (C) 1998 - 2017, Daniel Stenberg, <dan...@haxx.se>, et al. - rem * - rem * This software is licensed as described in the file COPYING, which - rem * you should have received as part of this distribution. The terms -@@ -73,7 +73,6 @@ rem - echo Generating prerequisite files - - call :generate -- if errorlevel 4 goto nogencurlbuild - if errorlevel 3 goto nogenhugehelp - if errorlevel 2 goto nogenmakefile - if errorlevel 1 goto warning -@@ -83,7 +82,6 @@ rem - echo Removing prerequisite files - - call :clean -- if errorlevel 3 goto nocleancurlbuild - if errorlevel 2 goto nocleanhugehelp - if errorlevel 1 goto nocleanmakefile - ) -@@ -98,7 +96,6 @@ rem 0 - success - rem 1 - success with simplified tool_hugehelp.c - rem 2 - failed to generate Makefile - rem 3 - failed to generate tool_hugehelp.c --rem 4 - failed to generate curlbuild.h - rem - :generate - if "%OS%" == "Windows_NT" setlocal -@@ -126,16 +123,6 @@ rem - ) - cmd /c exit 0 - -- rem Create curlbuild.h -- echo * %CD%\include\curl\curlbuild.h -- if exist include\curl\curlbuild.h.dist ( -- copy /Y include\curl\curlbuild.h.dist include\curl\curlbuild.h 1>NUL 2>&1 -- if errorlevel 1 ( -- if "%OS%" == "Windows_NT" endlocal -- exit /B 4 -- ) -- ) -- - rem Setup c-ares git tree - if exist ares\buildconf.bat ( - echo. -@@ -160,7 +147,6 @@ rem - rem 0 - success - rem 1 - failed to clean Makefile - rem 2 - failed to clean tool_hugehelp.c --rem 3 - failed to clean curlbuild.h - rem - :clean - rem Remove Makefile -@@ -181,15 +167,6 @@ rem - ) - ) - -- rem Remove curlbuild.h -- echo * %CD%\include\curl\curlbuild.h -- if exist include\curl\curlbuild.h ( -- del include\curl\curlbuild.h 2>NUL -- if exist include\curl\curlbuild.h ( -- exit /B 3 -- ) -- ) -- - exit /B - - rem Function to generate src\tool_hugehelp.c -@@ -304,11 +281,6 @@ rem - echo Error: Unable to generate src\tool_hugehelp.c - goto error - --:nogencurlbuild -- echo. -- echo Error: Unable to generate include\curl\curlbuild.h -- goto error -- - :nocleanmakefile - echo. - echo Error: Unable to clean Makefile -@@ -319,11 +291,6 @@ rem - echo Error: Unable to clean src\tool_hugehelp.c - goto error - --:nocleancurlbuild -- echo. -- echo Error: Unable to clean include\curl\curlbuild.h -- goto error -- - :warning - echo. - echo Warning: The curl manual could not be integrated in the source. This means when -diff --git a/configure.ac b/configure.ac -index d27575158..52b074ae0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -36,7 +36,7 @@ This configure script may be copied, distributed and modified under the - terms of the curl license; see COPYING for more details]) - - AC_CONFIG_SRCDIR([lib/urldata.h]) --AC_CONFIG_HEADERS(lib/curl_config.h include/curl/curlbuild.h) -+AC_CONFIG_HEADERS(lib/curl_config.h) - AC_CONFIG_MACRO_DIR([m4]) - AM_MAINTAINER_MODE - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -@@ -121,11 +121,6 @@ AC_SUBST([AR]) - - AC_SUBST(libext) - --dnl Remove non-configure distributed curlbuild.h --if test -f ${srcdir}/include/curl/curlbuild.h; then -- rm -f ${srcdir}/include/curl/curlbuild.h --fi -- - dnl figure out the libcurl version - CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)".*/\1/p' ${srcdir}/include/curl/curlver.h` - XC_CHECK_PROG_CC -diff --git a/docs/FAQ b/docs/FAQ -index 78c08ba25..1ab3c0e76 100644 ---- a/docs/FAQ -+++ b/docs/FAQ -@@ -30,7 +30,6 @@ FAQ - 2.2 Does curl work/build with other SSL libraries? - 2.3 Where can I find a copy of LIBEAY32.DLL? - 2.4 Does curl support SOCKS (RFC 1928) ? -- 2.5 Install libcurl for both 32bit and 64bit? - - 3. Usage Problems - 3.1 curl: (1) SSL is disabled, https: not supported -@@ -466,32 +465,6 @@ FAQ - - Yes, SOCKS 4 and 5 are supported. - -- 2.5 Install libcurl for both 32bit and 64bit? -- -- In curl's configure procedure one of the regular include files gets created -- with platform specific information. The file 'curl/curlbuild.h' in the -- installed libcurl file tree is therefore somewhat tied to that particular -- platform. -- -- To allow applications to get built for either 32bit or 64bit you need to -- install libcurl headers for both setups and unfortunately curl doesn't do -- this automatically. -- -- A commonly used procedure is this: -- -- $ ./configure [32bit platform] -- $ mv curl/curlbuild.h curl/curlbuild-32bit.h -- $ ./configure [64bit platform] -- $ mv curl/curlbuild.h curl/curlbuild-64bit.h -- -- Then you make a toplevel curl/curlbuild.h replacement that only does this: -- -- #ifdef IS_32BIT -- #include "curlbuild-32bit.h" -- else -- #include "curlbuild-64bit.h" -- #endif -- - - 3. Usage problems - -diff --git a/docs/INSTALL.cmake b/docs/INSTALL.cmake -index 61492dbd6..abdfb46b2 100644 ---- a/docs/INSTALL.cmake -+++ b/docs/INSTALL.cmake -@@ -37,17 +37,6 @@ Current flaws in the curl CMake build - - Does't detect the correct strerror_r flavor when cross-compiling (issue #1123) - - --Important notice --================== -- If you got your curl sources from a distribution tarball, make sure to -- delete the generic 'include/curl/curlbuild.h' file that comes with it: -- rm -f curl/include/curl/curlbuild.h -- -- The purpose of this file is to provide reasonable definitions for systems -- where autoconfiguration is not available. CMake will create its own -- version of this file in its build directory. If the "generic" version -- is not deleted, weird build errors may occur on some systems. -- - Command Line CMake - ================== - A CMake build of curl is similar to the autotools build of curl. It -diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am -index 7a56f345c..afd35c20b 100644 ---- a/docs/examples/Makefile.am -+++ b/docs/examples/Makefile.am -@@ -5,7 +5,7 @@ - # | (__| |_| | _ <| |___ - # \___|\___/|_| \_\_____| - # --# Copyright (C) 1998 - 2016, Daniel Stenberg, <dan...@haxx.se>, et al. -+# Copyright (C) 1998 - 2017, Daniel Stenberg, <dan...@haxx.se>, et al. - # - # This software is licensed as described in the file COPYING, which - # you should have received as part of this distribution. The terms -@@ -30,13 +30,9 @@ EXTRA_DIST = README Makefile.example Makefile.inc Makefile.m32 \ - # being currently built and tested are searched before the library which - # might possibly already be installed in the system. - # --# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h --# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h - # $(top_srcdir)/include is for libcurl's external include files - --AM_CPPFLAGS = -I$(top_builddir)/include/curl \ -- -I$(top_builddir)/include \ -- -I$(top_srcdir)/include -+AM_CPPFLAGS = -I$(top_srcdir)/include - - LIBDIR = $(top_builddir)/lib - -diff --git a/include/README b/include/README -index 6eb73b2b7..9e865aa11 100644 ---- a/include/README -+++ b/include/README -@@ -16,31 +16,9 @@ curl subdirectory. It makes it more likely to survive future modifications. - - NOTE FOR LIBCURL HACKERS - --The following notes apply to libcurl version 7.19.0 and later. -- --* The distributed curl/curlbuild.h file is only intended to be used on systems -- which can not run the also distributed configure script. -- --* The distributed curlbuild.h file is generated as a copy of curlbuild.h.dist -- when the libcurl source code distribution archive file is originally created. -- - * If you check out from git on a non-configure platform, you must run the -- appropriate buildconf* script to set up curlbuild.h and other local files -- before being able of compiling the library. -- --* On systems capable of running the configure script, the configure process -- will overwrite the distributed include/curl/curlbuild.h file with one that -- is suitable and specific to the library being configured and built, which -- is generated from the include/curl/curlbuild.h.in template file. -- --* If you intend to distribute an already compiled libcurl library you _MUST_ -- also distribute along with it the generated curl/curlbuild.h which has been -- used to compile it. Otherwise the library will be of no use for the users of -- the library that you have built. It is _your_ responsibility to provide this -- file. No one at the curl project can know how you have built the library. -- --* File curl/curlbuild.h includes platform and configuration dependent info, -- and must not be modified by anyone. Configure script generates it for you. -+ appropriate buildconf* script to set up files before being able of compiling -+ the library. - - * We cannot assume anything else but very basic compiler features being - present. While libcurl requires an ANSI C compiler to build, some of the -diff --git a/include/curl/Makefile.am b/include/curl/Makefile.am -index 9011c793c..989d4a218 100644 ---- a/include/curl/Makefile.am -+++ b/include/curl/Makefile.am -@@ -21,31 +21,12 @@ - ########################################################################### - pkginclude_HEADERS = \ - curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \ -- typecheck-gcc.h curlbuild.h curlrules.h system.h -+ typecheck-gcc.h system.h - - pkgincludedir= $(includedir)/curl - --# 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 -Wcurlbuild.h -D$(top_srcdir)/include/curl $(pkginclude_HEADERS) $(EXTRA_DIST) -+ @@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/include/curl $(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/curl/curl.h -index ddba98c4b..b0a6bfbb2 100644 ---- a/include/curl/curl.h -+++ b/include/curl/curl.h -@@ -36,8 +36,6 @@ - - #include "curlver.h" /* libcurl version defines */ - #include "system.h" /* determine things run-time */ --#include "curlbuild.h" /* libcurl build definitions */ --#include "curlrules.h" /* libcurl rules enforcement */ - - /* - * Define WIN32 when build target is Win32 API -diff --git a/include/curl/curlbuild.h.cmake b/include/curl/curlbuild.h.cmake -deleted file mode 100644 -index bbb31a940..000000000 ---- a/include/curl/curlbuild.h.cmake -+++ /dev/null -@@ -1,197 +0,0 @@ --#ifndef __CURL_CURLBUILD_H --#define __CURL_CURLBUILD_H --/*************************************************************************** -- * _ _ ____ _ -- * Project ___| | | | _ \| | -- * / __| | | | |_) | | -- * | (__| |_| | _ <| |___ -- * \___|\___/|_| \_\_____| -- * -- * Copyright (C) 1998 - 2008, Daniel Stenberg, <dan...@haxx.se>, et al. -- * -- * This software is licensed as described in the file COPYING, which -- * you should have received as part of this distribution. The terms -- * 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. -- * -- ***************************************************************************/ -- --/* ================================================================ */ --/* NOTES FOR CONFIGURE CAPABLE SYSTEMS */ --/* ================================================================ */ -- --/* -- * NOTE 1: -- * ------- -- * -- * Nothing in this file is intended to be modified or adjusted by the -- * curl library user nor by the curl library builder. -- * -- * If you think that something actually needs to be changed, adjusted -- * or fixed in this file, then, report it on the libcurl development -- * mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/ -- * -- * This header file shall only export symbols which are 'curl' or 'CURL' -- * prefixed, otherwise public name space would be polluted. -- * -- * NOTE 2: -- * ------- -- * -- * Right now you might be staring at file include/curl/curlbuild.h.in or -- * at file include/curl/curlbuild.h, this is due to the following reason: -- * -- * On systems capable of running the configure script, the configure process -- * will overwrite the distributed include/curl/curlbuild.h file with one that -- * is suitable and specific to the library being configured and built, which -- * is generated from the include/curl/curlbuild.h.in template file. -- * -- */ -- --/* ================================================================ */ --/* DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE */ --/* ================================================================ */ -- --#ifdef CURL_SIZEOF_LONG --#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined --#endif -- --#ifdef CURL_TYPEOF_CURL_SOCKLEN_T --#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined --#endif -- --#ifdef CURL_SIZEOF_CURL_SOCKLEN_T --#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined --#endif -- --#ifdef CURL_TYPEOF_CURL_OFF_T --#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined --#endif -- --#ifdef CURL_FORMAT_CURL_OFF_T --#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined --#endif -- --#ifdef CURL_FORMAT_CURL_OFF_TU --#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined --#endif -- --#ifdef CURL_FORMAT_OFF_T --#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined --#endif -- --#ifdef CURL_SIZEOF_CURL_OFF_T --#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined --#endif -- --#ifdef CURL_SUFFIX_CURL_OFF_T --#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined --#endif -- --#ifdef CURL_SUFFIX_CURL_OFF_TU --#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined --#endif -- --/* ================================================================ */ --/* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */ --/* ================================================================ */ -- --/* Configure process defines this to 1 when it finds out that system */ --/* header file ws2tcpip.h must be included by the external interface. */ --#cmakedefine CURL_PULL_WS2TCPIP_H --#ifdef CURL_PULL_WS2TCPIP_H --# ifndef WIN32_LEAN_AND_MEAN --# define WIN32_LEAN_AND_MEAN --# endif --# include <windows.h> --# include <winsock2.h> --# include <ws2tcpip.h> --#endif -- --/* Configure process defines this to 1 when it finds out that system */ --/* header file sys/types.h must be included by the external interface. */ --#cmakedefine CURL_PULL_SYS_TYPES_H --#ifdef CURL_PULL_SYS_TYPES_H --# include <sys/types.h> --#endif -- --/* Configure process defines this to 1 when it finds out that system */ --/* header file stdint.h must be included by the external interface. */ --#cmakedefine CURL_PULL_STDINT_H --#ifdef CURL_PULL_STDINT_H --# include <stdint.h> --#endif -- --/* Configure process defines this to 1 when it finds out that system */ --/* header file inttypes.h must be included by the external interface. */ --#cmakedefine CURL_PULL_INTTYPES_H --#ifdef CURL_PULL_INTTYPES_H --# include <inttypes.h> --#endif -- --/* Configure process defines this to 1 when it finds out that system */ --/* header file sys/socket.h must be included by the external interface. */ --#cmakedefine CURL_PULL_SYS_SOCKET_H --#ifdef CURL_PULL_SYS_SOCKET_H --# include <sys/socket.h> --#endif -- --/* Configure process defines this to 1 when it finds out that system */ --/* header file sys/poll.h must be included by the external interface. */ --#cmakedefine CURL_PULL_SYS_POLL_H --#ifdef CURL_PULL_SYS_POLL_H --# include <sys/poll.h> --#endif -- --/* The size of `long', as computed by sizeof. */ --#define CURL_SIZEOF_LONG ${CURL_SIZEOF_LONG} -- --/* Integral data type used for curl_socklen_t. */ --#define CURL_TYPEOF_CURL_SOCKLEN_T ${CURL_TYPEOF_CURL_SOCKLEN_T} -- --/* The size of `curl_socklen_t', as computed by sizeof. */ --#define CURL_SIZEOF_CURL_SOCKLEN_T ${CURL_SIZEOF_CURL_SOCKLEN_T} -- --/* Data type definition of curl_socklen_t. */ --typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; -- --/* Signed integral data type used for curl_off_t. */ --#define CURL_TYPEOF_CURL_OFF_T ${CURL_TYPEOF_CURL_OFF_T} -- --/* Data type definition of curl_off_t. */ --typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; -- --/* curl_off_t formatting string directive without "%" conversion specifier. */ --#define CURL_FORMAT_CURL_OFF_T "${CURL_FORMAT_CURL_OFF_T}" -- --/* unsigned curl_off_t formatting string without "%" conversion specifier. */ --#define CURL_FORMAT_CURL_OFF_TU "${CURL_FORMAT_CURL_OFF_TU}" -- --/* curl_off_t formatting string directive with "%" conversion specifier. */ --#define CURL_FORMAT_OFF_T "${CURL_FORMAT_OFF_T}" -- --/* The size of `curl_off_t', as computed by sizeof. */ --#define CURL_SIZEOF_CURL_OFF_T ${CURL_SIZEOF_CURL_OFF_T} -- --/* curl_off_t constant suffix. */ --#define CURL_SUFFIX_CURL_OFF_T ${CURL_SUFFIX_CURL_OFF_T} -- --/* unsigned curl_off_t constant suffix. */ --#define CURL_SUFFIX_CURL_OFF_TU ${CURL_SUFFIX_CURL_OFF_TU} -- --#endif /* __CURL_CURLBUILD_H */ -diff --git a/include/curl/curlbuild.h.in b/include/curl/curlbuild.h.in -deleted file mode 100644 -index ffab35670..000000000 ---- a/include/curl/curlbuild.h.in -+++ /dev/null -@@ -1,197 +0,0 @@ --#ifndef __CURL_CURLBUILD_H --#define __CURL_CURLBUILD_H --/*************************************************************************** -- * _ _ ____ _ -- * Project ___| | | | _ \| | -- * / __| | | | |_) | | -- * | (__| |_| | _ <| |___ -- * \___|\___/|_| \_\_____| -- * -- * Copyright (C) 1998 - 2012, Daniel Stenberg, <dan...@haxx.se>, et al. -- * -- * This software is licensed as described in the file COPYING, which -- * you should have received as part of this distribution. The terms -- * 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. -- * -- ***************************************************************************/ -- --/* ================================================================ */ --/* NOTES FOR CONFIGURE CAPABLE SYSTEMS */ --/* ================================================================ */ -- --/* -- * NOTE 1: -- * ------- -- * -- * Nothing in this file is intended to be modified or adjusted by the -- * curl library user nor by the curl library builder. -- * -- * If you think that something actually needs to be changed, adjusted -- * or fixed in this file, then, report it on the libcurl development -- * mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/ -- * -- * This header file shall only export symbols which are 'curl' or 'CURL' -- * prefixed, otherwise public name space would be polluted. -- * -- * NOTE 2: -- * ------- -- * -- * Right now you might be staring at file include/curl/curlbuild.h.in or -- * at file include/curl/curlbuild.h, this is due to the following reason: -- * -- * On systems capable of running the configure script, the configure process -- * will overwrite the distributed include/curl/curlbuild.h file with one that -- * is suitable and specific to the library being configured and built, which -- * is generated from the include/curl/curlbuild.h.in template file. -- * -- */ -- --/* ================================================================ */ --/* DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE */ --/* ================================================================ */ -- --#ifdef CURL_SIZEOF_LONG --#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined --#endif -- --#ifdef CURL_TYPEOF_CURL_SOCKLEN_T --#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined --#endif -- --#ifdef CURL_SIZEOF_CURL_SOCKLEN_T --#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined --#endif -- --#ifdef CURL_TYPEOF_CURL_OFF_T --#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined --#endif -- --#ifdef CURL_FORMAT_CURL_OFF_T --#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined --#endif -- --#ifdef CURL_FORMAT_CURL_OFF_TU --#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined --#endif -- --#ifdef CURL_FORMAT_OFF_T --#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined --#endif -- --#ifdef CURL_SIZEOF_CURL_OFF_T --#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined --#endif -- --#ifdef CURL_SUFFIX_CURL_OFF_T --#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined --#endif -- --#ifdef CURL_SUFFIX_CURL_OFF_TU --#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h" -- Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined --#endif -- --/* ================================================================ */ --/* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */ --/* ================================================================ */ -- --/* Configure process defines this to 1 when it finds out that system */ --/* header file ws2tcpip.h must be included by the external interface. */ --#undef CURL_PULL_WS2TCPIP_H --#ifdef CURL_PULL_WS2TCPIP_H --# ifndef WIN32_LEAN_AND_MEAN --# define WIN32_LEAN_AND_MEAN --# endif --# include <windows.h> --# include <winsock2.h> --# include <ws2tcpip.h> --#endif -- --/* Configure process defines this to 1 when it finds out that system */ --/* header file sys/types.h must be included by the external interface. */ --#undef CURL_PULL_SYS_TYPES_H --#ifdef CURL_PULL_SYS_TYPES_H --# include <sys/types.h> --#endif -- --/* Configure process defines this to 1 when it finds out that system */ --/* header file stdint.h must be included by the external interface. */ --#undef CURL_PULL_STDINT_H --#ifdef CURL_PULL_STDINT_H --# include <stdint.h> --#endif -- --/* Configure process defines this to 1 when it finds out that system */ --/* header file inttypes.h must be included by the external interface. */ --#undef CURL_PULL_INTTYPES_H --#ifdef CURL_PULL_INTTYPES_H --# include <inttypes.h> --#endif -- --/* Configure process defines this to 1 when it finds out that system */ --/* header file sys/socket.h must be included by the external interface. */ --#undef CURL_PULL_SYS_SOCKET_H --#ifdef CURL_PULL_SYS_SOCKET_H --# include <sys/socket.h> --#endif -- --/* Configure process defines this to 1 when it finds out that system */ --/* header file sys/poll.h must be included by the external interface. */ --#undef CURL_PULL_SYS_POLL_H --#ifdef CURL_PULL_SYS_POLL_H --# include <sys/poll.h> --#endif -- --/* The size of `long', as computed by sizeof. */ --#undef CURL_SIZEOF_LONG -- --/* Integral data type used for curl_socklen_t. */ --#undef CURL_TYPEOF_CURL_SOCKLEN_T -- --/* The size of `curl_socklen_t', as computed by sizeof. */ --#undef CURL_SIZEOF_CURL_SOCKLEN_T -- --/* Data type definition of curl_socklen_t. */ --typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; -- --/* Signed integral data type used for curl_off_t. */ --#undef CURL_TYPEOF_CURL_OFF_T -- --/* Data type definition of curl_off_t. */ --typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; -- --/* curl_off_t formatting string directive without "%" conversion specifier. */ --#undef CURL_FORMAT_CURL_OFF_T -- --/* unsigned curl_off_t formatting string without "%" conversion specifier. */ --#undef CURL_FORMAT_CURL_OFF_TU -- --/* curl_off_t formatting string directive with "%" conversion specifier. */ --#undef CURL_FORMAT_OFF_T -- --/* The size of `curl_off_t', as computed by sizeof. */ --#undef CURL_SIZEOF_CURL_OFF_T -- --/* curl_off_t constant suffix. */ --#undef CURL_SUFFIX_CURL_OFF_T -- --/* unsigned curl_off_t constant suffix. */ --#undef CURL_SUFFIX_CURL_OFF_TU -- --#endif /* __CURL_CURLBUILD_H */ -diff --git a/include/curl/curlrules.h b/include/curl/curlrules.h -deleted file mode 100644 -index 0abd9f71d..000000000 ---- a/include/curl/curlrules.h -+++ /dev/null -@@ -1,239 +0,0 @@ --#ifndef __CURL_CURLRULES_H --#define __CURL_CURLRULES_H --/*************************************************************************** -- * _ _ ____ _ -- * Project ___| | | | _ \| | -- * / __| | | | |_) | | -- * | (__| |_| | _ <| |___ -- * \___|\___/|_| \_\_____| -- * -- * Copyright (C) 1998 - 2017, Daniel Stenberg, <dan...@haxx.se>, et al. -- * -- * This software is licensed as described in the file COPYING, which -- * you should have received as part of this distribution. The terms -- * 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. -- * -- ***************************************************************************/ -- --/* ================================================================ */ --/* COMPILE TIME SANITY CHECKS */ --/* ================================================================ */ -- --/* -- * NOTE 1: -- * ------- -- * -- * All checks done in this file are intentionally placed in a public -- * header file which is pulled by curl/curl.h when an application is -- * being built using an already built libcurl library. Additionally -- * this file is also included and used when building the library. -- * -- * If compilation fails on this file it is certainly sure that the -- * problem is elsewhere. It could be a problem in the curlbuild.h -- * header file, or simply that you are using different compilation -- * settings than those used to build the library. -- * -- * Nothing in this file is intended to be modified or adjusted by the -- * curl library user nor by the curl library builder. -- * -- * Do not deactivate any check, these are done to make sure that the -- * library is properly built and used. -- * -- * You can find further help on the libcurl development mailing list: -- * https://cool.haxx.se/mailman/listinfo/curl-library/ -- * -- * NOTE 2 -- * ------ -- * -- * Some of the following compile time checks are based on the fact -- * that the dimension of a constant array can not be a negative one. -- * In this way if the compile time verification fails, the compilation -- * will fail issuing an error. The error description wording is compiler -- * dependent but it will be quite similar to one of the following: -- * -- * "negative subscript or subscript is too large" -- * "array must have at least one element" -- * "-1 is an illegal array size" -- * "size of array is negative" -- * -- * If you are building an application which tries to use an already -- * built libcurl library and you are getting this kind of errors on -- * this file, it is a clear indication that there is a mismatch between -- * how the library was built and how you are trying to use it for your -- * application. Your already compiled or binary library provider is the -- * only one who can give you the details you need to properly use it. -- */ -- --/* -- * Verify that some macros are actually defined. -- */ -- --#ifndef CURL_SIZEOF_LONG --# error "CURL_SIZEOF_LONG definition is missing!" -- Error Compilation_aborted_CURL_SIZEOF_LONG_is_missing --#endif -- --#ifndef CURL_TYPEOF_CURL_SOCKLEN_T --# error "CURL_TYPEOF_CURL_SOCKLEN_T definition is missing!" -- Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_is_missing --#endif -- --#ifndef CURL_SIZEOF_CURL_SOCKLEN_T --# error "CURL_SIZEOF_CURL_SOCKLEN_T definition is missing!" -- Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_is_missing --#endif -- --#ifndef CURL_TYPEOF_CURL_OFF_T --# error "CURL_TYPEOF_CURL_OFF_T definition is missing!" -- Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_is_missing --#endif -- --#ifndef CURL_FORMAT_CURL_OFF_T --# error "CURL_FORMAT_CURL_OFF_T definition is missing!" -- Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_is_missing --#endif -- --#ifndef CURL_FORMAT_CURL_OFF_TU --# error "CURL_FORMAT_CURL_OFF_TU definition is missing!" -- Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_is_missing --#endif -- --#ifndef CURL_SIZEOF_CURL_OFF_T --# error "CURL_SIZEOF_CURL_OFF_T definition is missing!" -- Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_is_missing --#endif -- --#ifndef CURL_SUFFIX_CURL_OFF_T --# error "CURL_SUFFIX_CURL_OFF_T definition is missing!" -- Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_is_missing --#endif -- --#ifndef CURL_SUFFIX_CURL_OFF_TU --# error "CURL_SUFFIX_CURL_OFF_TU definition is missing!" -- Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_is_missing --#endif -- --/* -- * Macros private to this header file. -- */ -- --#define CurlchkszEQ(t, s) sizeof(t) == s ? 1 : -1 -- --#define CurlchkszGE(t1, t2) sizeof(t1) >= sizeof(t2) ? 1 : -1 -- --/* -- * Verify that the size previously defined and expected for long -- * is the same as the one reported by sizeof() at compile time. -- */ -- --typedef char -- __curl_rule_01__ -- [CurlchkszEQ(long, CURL_SIZEOF_LONG)]; -- --/* -- * Verify that the size previously defined and expected for -- * curl_off_t is actually the the same as the one reported -- * by sizeof() at compile time. -- */ -- --typedef char -- __curl_rule_02__ -- [CurlchkszEQ(curl_off_t, CURL_SIZEOF_CURL_OFF_T)]; -- --/* -- * Verify at compile time that the size of curl_off_t as reported -- * by sizeof() is greater or equal than the one reported for long -- * for the current compilation. -- */ -- --typedef char -- __curl_rule_03__ -- [CurlchkszGE(curl_off_t, long)]; -- --/* -- * Verify that the size previously defined and expected for -- * curl_socklen_t is actually the the same as the one reported -- * by sizeof() at compile time. -- */ -- --typedef char -- __curl_rule_04__ -- [CurlchkszEQ(curl_socklen_t, CURL_SIZEOF_CURL_SOCKLEN_T)]; -- --/* -- * Verify at compile time that the size of curl_socklen_t as reported -- * by sizeof() is greater or equal than the one reported for int for -- * the current compilation. -- */ -- --typedef char -- __curl_rule_05__ -- [CurlchkszGE(curl_socklen_t, int)]; -- --/* ================================================================ */ --/* EXTERNALLY AND INTERNALLY VISIBLE DEFINITIONS */ --/* ================================================================ */ -- --/* -- * CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow -- * these to be visible and exported by the external libcurl interface API, -- * while also making them visible to the library internals, simply including -- * curl_setup.h, without actually needing to include curl.h internally. -- * If some day this section would grow big enough, all this should be moved -- * to its own header file. -- */ -- --/* -- * Figure out if we can use the ## preprocessor operator, which is supported -- * by ISO/ANSI C and C++. Some compilers support it without setting __STDC__ -- * or __cplusplus so we need to carefully check for them too. -- */ -- --#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \ -- defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \ -- defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \ -- defined(__ILEC400__) -- /* This compiler is believed to have an ISO compatible preprocessor */ --#define CURL_ISOCPP --#else -- /* This compiler is believed NOT to have an ISO compatible preprocessor */ --#undef CURL_ISOCPP --#endif -- --/* -- * Macros for minimum-width signed and unsigned curl_off_t integer constants. -- */ -- --#if defined(__BORLANDC__) && (__BORLANDC__ == 0x0551) --# define __CURL_OFF_T_C_HLPR2(x) x --# define __CURL_OFF_T_C_HLPR1(x) __CURL_OFF_T_C_HLPR2(x) --# define CURL_OFF_T_C(Val) __CURL_OFF_T_C_HLPR1(Val) ## \ -- __CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_T) --# define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val) ## \ -- __CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_TU) --#else --# ifdef CURL_ISOCPP --# define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val ## Suffix --# else --# define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val/**/Suffix --# endif --# define __CURL_OFF_T_C_HLPR1(Val,Suffix) __CURL_OFF_T_C_HLPR2(Val,Suffix) --# define CURL_OFF_T_C(Val) __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_T) --# define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_TU) --#endif -- --/* -- * Get rid of macros private to this header file. -- */ -- --#undef CurlchkszEQ --#undef CurlchkszGE -- --#endif /* __CURL_CURLRULES_H */ -diff --git a/include/curl/system.h b/include/curl/system.h -index ed3a55c95..c43753688 100644 ---- a/include/curl/system.h -+++ b/include/curl/system.h -@@ -23,14 +23,6 @@ - ***************************************************************************/ - - /* -- * This header is supposed to eventually replace curlbuild.h. This little one -- * is still learning. During the experimental phase, this header files -- * defines symbols using the prefixes CURLSYS_ or curlsys_. When we feel -- * confident enough, we replace curlbuild.h with this file and rename all -- * prefixes to CURL_ and curl_. -- */ -- --/* - * Try to keep one section per platform, compiler and architecture, otherwise, - * if an existing section is reused for a different one and later on the - * original is adjusted, probably the piggybacking one can be adversely -@@ -60,323 +52,323 @@ - - #if defined(__DJGPP__) || defined(__GO32__) - # if defined(__DJGPP__) && (__DJGPP__ > 1) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long long --# define CURLSYS_FORMAT_CURL_OFF_T "lld" --# define CURLSYS_FORMAT_CURL_OFF_TU "llu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T LL --# define CURLSYS_SUFFIX_CURL_OFF_TU ULL -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long long -+# define CURL_FORMAT_CURL_OFF_T "lld" -+# define CURL_FORMAT_CURL_OFF_TU "llu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T LL -+# define CURL_SUFFIX_CURL_OFF_TU ULL - # else --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 4 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 4 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL - # endif --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T int --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_TYPEOF_CURL_SOCKLEN_T int -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - - #elif defined(__SALFORDC__) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 4 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T int --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 4 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL -+# define CURL_TYPEOF_CURL_SOCKLEN_T int -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - - #elif defined(__BORLANDC__) - # if (__BORLANDC__ < 0x520) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 4 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 4 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL - # else --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T __int64 --# define CURLSYS_FORMAT_CURL_OFF_T "I64d" --# define CURLSYS_FORMAT_CURL_OFF_TU "I64u" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T i64 --# define CURLSYS_SUFFIX_CURL_OFF_TU ui64 -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T __int64 -+# define CURL_FORMAT_CURL_OFF_T "I64d" -+# define CURL_FORMAT_CURL_OFF_TU "I64u" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T i64 -+# define CURL_SUFFIX_CURL_OFF_TU ui64 - # endif --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T int --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_TYPEOF_CURL_SOCKLEN_T int -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - - #elif defined(__TURBOC__) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 4 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T int --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 4 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL -+# define CURL_TYPEOF_CURL_SOCKLEN_T int -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - - #elif defined(__WATCOMC__) - # if defined(__386__) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T __int64 --# define CURLSYS_FORMAT_CURL_OFF_T "I64d" --# define CURLSYS_FORMAT_CURL_OFF_TU "I64u" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T i64 --# define CURLSYS_SUFFIX_CURL_OFF_TU ui64 -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T __int64 -+# define CURL_FORMAT_CURL_OFF_T "I64d" -+# define CURL_FORMAT_CURL_OFF_TU "I64u" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T i64 -+# define CURL_SUFFIX_CURL_OFF_TU ui64 - # else --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 4 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 4 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL - # endif --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T int --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_TYPEOF_CURL_SOCKLEN_T int -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - - #elif defined(__POCC__) - # if (__POCC__ < 280) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 4 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 4 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL - # elif defined(_MSC_VER) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T __int64 --# define CURLSYS_FORMAT_CURL_OFF_T "I64d" --# define CURLSYS_FORMAT_CURL_OFF_TU "I64u" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T i64 --# define CURLSYS_SUFFIX_CURL_OFF_TU ui64 -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T __int64 -+# define CURL_FORMAT_CURL_OFF_T "I64d" -+# define CURL_FORMAT_CURL_OFF_TU "I64u" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T i64 -+# define CURL_SUFFIX_CURL_OFF_TU ui64 - # else --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long long --# define CURLSYS_FORMAT_CURL_OFF_T "lld" --# define CURLSYS_FORMAT_CURL_OFF_TU "llu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T LL --# define CURLSYS_SUFFIX_CURL_OFF_TU ULL -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long long -+# define CURL_FORMAT_CURL_OFF_T "lld" -+# define CURL_FORMAT_CURL_OFF_TU "llu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T LL -+# define CURL_SUFFIX_CURL_OFF_TU ULL - # endif --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T int --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_TYPEOF_CURL_SOCKLEN_T int -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - - #elif defined(__LCC__) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 4 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T int --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 4 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL -+# define CURL_TYPEOF_CURL_SOCKLEN_T int -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - - #elif defined(__SYMBIAN32__) - # if defined(__EABI__) /* Treat all ARM compilers equally */ --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long long --# define CURLSYS_FORMAT_CURL_OFF_T "lld" --# define CURLSYS_FORMAT_CURL_OFF_TU "llu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T LL --# define CURLSYS_SUFFIX_CURL_OFF_TU ULL -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long long -+# define CURL_FORMAT_CURL_OFF_T "lld" -+# define CURL_FORMAT_CURL_OFF_TU "llu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T LL -+# define CURL_SUFFIX_CURL_OFF_TU ULL - # elif defined(__CW32__) - # pragma longlong on --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long long --# define CURLSYS_FORMAT_CURL_OFF_T "lld" --# define CURLSYS_FORMAT_CURL_OFF_TU "llu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T LL --# define CURLSYS_SUFFIX_CURL_OFF_TU ULL -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long long -+# define CURL_FORMAT_CURL_OFF_T "lld" -+# define CURL_FORMAT_CURL_OFF_TU "llu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T LL -+# define CURL_SUFFIX_CURL_OFF_TU ULL - # elif defined(__VC32__) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T __int64 --# define CURLSYS_FORMAT_CURL_OFF_T "lld" --# define CURLSYS_FORMAT_CURL_OFF_TU "llu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T LL --# define CURLSYS_SUFFIX_CURL_OFF_TU ULL -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T __int64 -+# define CURL_FORMAT_CURL_OFF_T "lld" -+# define CURL_FORMAT_CURL_OFF_TU "llu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T LL -+# define CURL_SUFFIX_CURL_OFF_TU ULL - # endif --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T unsigned int --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - - #elif defined(__MWERKS__) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long long --# define CURLSYS_FORMAT_CURL_OFF_T "lld" --# define CURLSYS_FORMAT_CURL_OFF_TU "llu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T LL --# define CURLSYS_SUFFIX_CURL_OFF_TU ULL --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T int --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long long -+# define CURL_FORMAT_CURL_OFF_T "lld" -+# define CURL_FORMAT_CURL_OFF_TU "llu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T LL -+# define CURL_SUFFIX_CURL_OFF_TU ULL -+# define CURL_TYPEOF_CURL_SOCKLEN_T int -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - - #elif defined(_WIN32_WCE) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T __int64 --# define CURLSYS_FORMAT_CURL_OFF_T "I64d" --# define CURLSYS_FORMAT_CURL_OFF_TU "I64u" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T i64 --# define CURLSYS_SUFFIX_CURL_OFF_TU ui64 --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T int --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T __int64 -+# define CURL_FORMAT_CURL_OFF_T "I64d" -+# define CURL_FORMAT_CURL_OFF_TU "I64u" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T i64 -+# define CURL_SUFFIX_CURL_OFF_TU ui64 -+# define CURL_TYPEOF_CURL_SOCKLEN_T int -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - - #elif defined(__MINGW32__) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long long --# define CURLSYS_FORMAT_CURL_OFF_T "I64d" --# define CURLSYS_FORMAT_CURL_OFF_TU "I64u" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T LL --# define CURLSYS_SUFFIX_CURL_OFF_TU ULL --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T socklen_t --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 --# define CURLSYS_PULL_SYS_TYPES_H 1 --# define CURLSYS_PULL_WS2TCPIP_H 1 -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long long -+# define CURL_FORMAT_CURL_OFF_T "I64d" -+# define CURL_FORMAT_CURL_OFF_TU "I64u" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T LL -+# define CURL_SUFFIX_CURL_OFF_TU ULL -+# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_PULL_SYS_TYPES_H 1 -+# define CURL_PULL_WS2TCPIP_H 1 - - #elif defined(__VMS) - # if defined(__VAX) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 4 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 4 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL - # else --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long long --# define CURLSYS_FORMAT_CURL_OFF_T "lld" --# define CURLSYS_FORMAT_CURL_OFF_TU "llu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T LL --# define CURLSYS_SUFFIX_CURL_OFF_TU ULL -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long long -+# define CURL_FORMAT_CURL_OFF_T "lld" -+# define CURL_FORMAT_CURL_OFF_TU "llu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T LL -+# define CURL_SUFFIX_CURL_OFF_TU ULL - # endif --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T unsigned int --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - - #elif defined(__OS400__) - # if defined(__ILEC400__) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long long --# define CURLSYS_FORMAT_CURL_OFF_T "lld" --# define CURLSYS_FORMAT_CURL_OFF_TU "llu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T LL --# define CURLSYS_SUFFIX_CURL_OFF_TU ULL --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T socklen_t --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 --# define CURLSYS_PULL_SYS_TYPES_H 1 --# define CURLSYS_PULL_SYS_SOCKET_H 1 -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long long -+# define CURL_FORMAT_CURL_OFF_T "lld" -+# define CURL_FORMAT_CURL_OFF_TU "llu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T LL -+# define CURL_SUFFIX_CURL_OFF_TU ULL -+# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_PULL_SYS_TYPES_H 1 -+# define CURL_PULL_SYS_SOCKET_H 1 - # endif - - #elif defined(__MVS__) - # if defined(__IBMC__) || defined(__IBMCPP__) - # if defined(_ILP32) --# define CURLSYS_SIZEOF_LONG 4 -+# define CURL_SIZEOF_LONG 4 - # elif defined(_LP64) --# define CURLSYS_SIZEOF_LONG 8 -+# define CURL_SIZEOF_LONG 8 - # endif - # if defined(_LONG_LONG) --# define CURLSYS_TYPEOF_CURL_OFF_T long long --# define CURLSYS_FORMAT_CURL_OFF_T "lld" --# define CURLSYS_FORMAT_CURL_OFF_TU "llu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T LL --# define CURLSYS_SUFFIX_CURL_OFF_TU ULL -+# define CURL_TYPEOF_CURL_OFF_T long long -+# define CURL_FORMAT_CURL_OFF_T "lld" -+# define CURL_FORMAT_CURL_OFF_TU "llu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T LL -+# define CURL_SUFFIX_CURL_OFF_TU ULL - # elif defined(_LP64) --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL - # else --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 4 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 4 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL - # endif --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T socklen_t --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 --# define CURLSYS_PULL_SYS_TYPES_H 1 --# define CURLSYS_PULL_SYS_SOCKET_H 1 -+# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_PULL_SYS_TYPES_H 1 -+# define CURL_PULL_SYS_SOCKET_H 1 - # endif - - #elif defined(__370__) - # if defined(__IBMC__) || defined(__IBMCPP__) - # if defined(_ILP32) --# define CURLSYS_SIZEOF_LONG 4 -+# define CURL_SIZEOF_LONG 4 - # elif defined(_LP64) --# define CURLSYS_SIZEOF_LONG 8 -+# define CURL_SIZEOF_LONG 8 - # endif - # if defined(_LONG_LONG) --# define CURLSYS_TYPEOF_CURL_OFF_T long long --# define CURLSYS_FORMAT_CURL_OFF_T "lld" --# define CURLSYS_FORMAT_CURL_OFF_TU "llu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T LL --# define CURLSYS_SUFFIX_CURL_OFF_TU ULL -+# define CURL_TYPEOF_CURL_OFF_T long long -+# define CURL_FORMAT_CURL_OFF_T "lld" -+# define CURL_FORMAT_CURL_OFF_TU "llu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T LL -+# define CURL_SUFFIX_CURL_OFF_TU ULL - # elif defined(_LP64) --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL - # else --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 4 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 4 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL - # endif --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T socklen_t --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 --# define CURLSYS_PULL_SYS_TYPES_H 1 --# define CURLSYS_PULL_SYS_SOCKET_H 1 -+# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_PULL_SYS_TYPES_H 1 -+# define CURL_PULL_SYS_SOCKET_H 1 - # endif - - #elif defined(TPF) --# define CURLSYS_SIZEOF_LONG 8 --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T int --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_SIZEOF_LONG 8 -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL -+# define CURL_TYPEOF_CURL_SOCKLEN_T int -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - - #elif defined(__TINYC__) /* also known as tcc */ - --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long long --# define CURLSYS_FORMAT_CURL_OFF_T "lld" --# define CURLSYS_FORMAT_CURL_OFF_TU "llu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T LL --# define CURLSYS_SUFFIX_CURL_OFF_TU ULL --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T socklen_t --# define CURLSYS_PULL_SYS_TYPES_H 1 --# define CURLSYS_PULL_SYS_SOCKET_H 1 -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long long -+# define CURL_FORMAT_CURL_OFF_T "lld" -+# define CURL_FORMAT_CURL_OFF_TU "llu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T LL -+# define CURL_SUFFIX_CURL_OFF_TU ULL -+# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t -+# define CURL_PULL_SYS_TYPES_H 1 -+# define CURL_PULL_SYS_SOCKET_H 1 - - /* ===================================== */ - /* KEEP MSVC THE PENULTIMATE ENTRY */ -@@ -384,24 +376,24 @@ - - #elif defined(_MSC_VER) - # if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T __int64 --# define CURLSYS_FORMAT_CURL_OFF_T "I64d" --# define CURLSYS_FORMAT_CURL_OFF_TU "I64u" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T i64 --# define CURLSYS_SUFFIX_CURL_OFF_TU ui64 -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T __int64 -+# define CURL_FORMAT_CURL_OFF_T "I64d" -+# define CURL_FORMAT_CURL_OFF_TU "I64u" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T i64 -+# define CURL_SUFFIX_CURL_OFF_TU ui64 - # else --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 4 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 4 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL - # endif --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T int --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_TYPEOF_CURL_SOCKLEN_T int -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - - /* ===================================== */ - /* KEEP GENERIC GCC THE LAST ENTRY */ -@@ -411,39 +403,39 @@ - # if !defined(__LP64__) && (defined(__ILP32__) || \ - defined(__i386__) || defined(__ppc__) || defined(__arm__) || \ - defined(__sparc__) || defined(__mips__) || defined(__sh__)) --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long long --# define CURLSYS_FORMAT_CURL_OFF_T "lld" --# define CURLSYS_FORMAT_CURL_OFF_TU "llu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T LL --# define CURLSYS_SUFFIX_CURL_OFF_TU ULL -+# define CURL_SIZEOF_LONG 4 -+# define CURL_TYPEOF_CURL_OFF_T long long -+# define CURL_FORMAT_CURL_OFF_T "lld" -+# define CURL_FORMAT_CURL_OFF_TU "llu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T LL -+# define CURL_SUFFIX_CURL_OFF_TU ULL - # elif defined(__LP64__) || \ - defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__) --# define CURLSYS_SIZEOF_LONG 8 --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SIZEOF_CURL_OFF_T 8 --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL -+# define CURL_SIZEOF_LONG 8 -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SIZEOF_CURL_OFF_T 8 -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL - # endif --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T socklen_t --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 --# define CURLSYS_PULL_SYS_TYPES_H 1 --# define CURLSYS_PULL_SYS_SOCKET_H 1 -+# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_PULL_SYS_TYPES_H 1 -+# define CURL_PULL_SYS_SOCKET_H 1 - - #else - /* generic "safe guess" on old 32 bit style */ --# define CURLSYS_SIZEOF_LONG 4 --# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4 --# define CURLSYS_SIZEOF_CURL_OFF_T 4 --# define CURLSYS_TYPEOF_CURL_OFF_T long --# define CURLSYS_FORMAT_CURL_OFF_T "ld" --# define CURLSYS_FORMAT_CURL_OFF_TU "lu" --# define CURLSYS_SUFFIX_CURL_OFF_T L --# define CURLSYS_SUFFIX_CURL_OFF_TU UL --# define CURLSYS_TYPEOF_CURL_SOCKLEN_T int -+# define CURL_SIZEOF_LONG 4 -+# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+# define CURL_SIZEOF_CURL_OFF_T 4 -+# define CURL_TYPEOF_CURL_OFF_T long -+# define CURL_FORMAT_CURL_OFF_T "ld" -+# define CURL_FORMAT_CURL_OFF_TU "lu" -+# define CURL_SUFFIX_CURL_OFF_T L -+# define CURL_SUFFIX_CURL_OFF_TU UL -+# define CURL_TYPEOF_CURL_SOCKLEN_T int - #endif - - /* CURLSYS_PULL_WS2TCPIP_H is defined above when inclusion of header file */ -@@ -457,27 +449,75 @@ - # include <ws2tcpip.h> - #endif - --/* CURLSYS_PULL_SYS_TYPES_H is defined above when inclusion of header file */ -+/* CURL_PULL_SYS_TYPES_H is defined above when inclusion of header file */ - /* sys/types.h is required here to properly make type definitions below. */ --#ifdef CURLSYS_PULL_SYS_TYPES_H -+#ifdef CURL_PULL_SYS_TYPES_H - # include <sys/types.h> - #endif - --/* CURLSYS_PULL_SYS_SOCKET_H is defined above when inclusion of header file */ -+/* CURL_PULL_SYS_SOCKET_H is defined above when inclusion of header file */ - /* sys/socket.h is required here to properly make type definitions below. */ --#ifdef CURLSYS_PULL_SYS_SOCKET_H -+#ifdef CURL_PULL_SYS_SOCKET_H - # include <sys/socket.h> - #endif - - /* Data type definition of curl_socklen_t. */ --#ifdef CURLSYS_TYPEOF_CURL_SOCKLEN_T -- typedef CURLSYS_TYPEOF_CURL_SOCKLEN_T curlsys_socklen_t; -+#ifdef CURL_TYPEOF_CURL_SOCKLEN_T -+ typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; - #endif - - /* Data type definition of curl_off_t. */ - --#ifdef CURLSYS_TYPEOF_CURL_OFF_T -- typedef CURLSYS_TYPEOF_CURL_OFF_T curlsys_off_t; -+#ifdef CURL_TYPEOF_CURL_OFF_T -+ typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; -+#endif -+ -+/* -+ * CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow -+ * these to be visible and exported by the external libcurl interface API, -+ * while also making them visible to the library internals, simply including -+ * curl_setup.h, without actually needing to include curl.h internally. -+ * If some day this section would grow big enough, all this should be moved -+ * to its own header file. -+ */ -+ -+/* -+ * Figure out if we can use the ## preprocessor operator, which is supported -+ * by ISO/ANSI C and C++. Some compilers support it without setting __STDC__ -+ * or __cplusplus so we need to carefully check for them too. -+ */ -+ -+#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \ -+ defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \ -+ defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \ -+ defined(__ILEC400__) -+ /* This compiler is believed to have an ISO compatible preprocessor */ -+#define CURL_ISOCPP -+#else -+ /* This compiler is believed NOT to have an ISO compatible preprocessor */ -+#undef CURL_ISOCPP -+#endif -+ -+/* -+ * Macros for minimum-width signed and unsigned curl_off_t integer constants. -+ */ -+ -+#if defined(__BORLANDC__) && (__BORLANDC__ == 0x0551) -+# define __CURL_OFF_T_C_HLPR2(x) x -+# define __CURL_OFF_T_C_HLPR1(x) __CURL_OFF_T_C_HLPR2(x) -+# define CURL_OFF_T_C(Val) __CURL_OFF_T_C_HLPR1(Val) ## \ -+ __CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_T) -+# define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val) ## \ -+ __CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_TU) -+#else -+# ifdef CURL_ISOCPP -+# define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val ## Suffix -+# else -+# define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val/**/Suffix -+# endif -+# define __CURL_OFF_T_C_HLPR1(Val,Suffix) __CURL_OFF_T_C_HLPR2(Val,Suffix) -+# define CURL_OFF_T_C(Val) __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_T) -+# define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_TU) - #endif - - #endif /* __CURL_SYSTEM_H */ -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index eb2de6d87..f6dcbbc31 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -1,7 +1,5 @@ - set(LIB_NAME libcurl) - --configure_file(${CURL_SOURCE_DIR}/include/curl/curlbuild.h.cmake -- ${CURL_BINARY_DIR}/include/curl/curlbuild.h) - configure_file(curl_config.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/curl_config.h) - -@@ -10,7 +8,6 @@ include(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake) - - list(APPEND HHEADERS - ${CMAKE_CURRENT_BINARY_DIR}/curl_config.h -- ${CURL_BINARY_DIR}/include/curl/curlbuild.h - ) - - if(MSVC) -diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom -index cbc54cfc7..2130c276b 100644 ---- a/lib/Makefile.Watcom -+++ b/lib/Makefile.Watcom -@@ -6,7 +6,7 @@ - # \___|\___/|_| \_\_____| - # - # Copyright (C) 2005 - 2009, Gisle Vanem <gva...@yahoo.no>. --# Copyright (C) 2005 - 2015, Daniel Stenberg, <dan...@haxx.se>, et al. -+# Copyright (C) 2005 - 2017, Daniel Stenberg, <dan...@haxx.se>, et al. - # - # This software is licensed as described in the file COPYING, which - # you should have received as part of this distribution. The terms -@@ -192,14 +192,13 @@ OBJS4 = $(OBJS3: = ./) - OBJS_STAT = $(OBJS4:./=$(OBJ_STAT)/) - OBJS_DYN = $(OBJS4:./=$(OBJ_DYN)/) - --CURLBUILDH = ../include/curl/curlbuild.h - RESOURCE = $(OBJ_DYN)/libcurl.res - - DIRS = $(OBJ_BASE) $(OBJ_BASE)/stat $(OBJ_BASE)/dyn - - .c : vauth vtls - --all: $(CURLBUILDH) $(DIRS) $(TARGETS) .SYMBOLIC -+all: $(DIRS) $(TARGETS) .SYMBOLIC - @echo Welcome to libcurl - - clean: .SYMBOLIC -@@ -216,9 +215,6 @@ vclean distclean: clean .SYMBOLIC - $(DIRS): - -$(MD) $^@ - --$(CURLBUILDH): .EXISTSONLY -- $(CP) $^@.dist $^@ -- - $(LIBNAME).dll: $(OBJS_DYN) $(RESOURCE) $(__MAKEFILES__) - %create $(LINK_ARG) - @%append $(LINK_ARG) system nt dll -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 01a06a529..176bf3342 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -48,17 +48,13 @@ CFLAGS += @CURL_CFLAG_EXTRAS@ - # being currently built and tested are searched before the library which - # might possibly already be installed in the system. - # --# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h --# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h - # $(top_srcdir)/include is for libcurl's external include files - # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file - # $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "private" files - # $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file - # $(top_srcdir)/ares is for in-tree c-ares's external include files - --AM_CPPFLAGS = -I$(top_builddir)/include/curl \ -- -I$(top_builddir)/include \ -- -I$(top_srcdir)/include \ -+AM_CPPFLAGS = -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib - -diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 -index 522dbd1df..8895dfd8a 100644 ---- a/lib/Makefile.m32 -+++ b/lib/Makefile.m32 -@@ -5,7 +5,7 @@ - # | (__| |_| | _ <| |___ - # \___|\___/|_| \_\_____| - # --# Copyright (C) 1999 - 2015, Daniel Stenberg, <dan...@haxx.se>, et al. -+# Copyright (C) 1999 - 2017, Daniel Stenberg, <dan...@haxx.se>, et al. - # - # This software is licensed as described in the file COPYING, which - # you should have received as part of this distribution. The terms -@@ -340,24 +340,17 @@ $(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENC - -Wl,--output-def,$(@:.dll=.def),--out-implib,$(libcurl_dll_a_LIBRARY) \ - $(libcurl_a_OBJECTS) $(RESOURCE) $(DLL_LIBS) - --%.o: %.c $(PROOT)/include/curl/curlbuild.h -+%.o: %.c - $(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@ - - %.res: %.rc - $(RC) $(RCFLAGS) -i $< -o $@ - - clean: --ifeq "$(wildcard $(PROOT)/include/curl/curlbuild.h.dist)" "$(PROOT)/include/curl/curlbuild.h.dist" -- @$(call DEL, $(PROOT)/include/curl/curlbuild.h) --endif - @$(call DEL, $(libcurl_a_OBJECTS) $(RESOURCE)) - - distclean vclean: clean - @$(call DEL, $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY) $(libcurl_dll_LIBRARY:.dll=.def) $(libcurl_dll_a_LIBRARY)) - --$(PROOT)/include/curl/curlbuild.h: -- @echo Creating $@ -- @$(call COPY, $@.dist, $@) -- - $(LIBCARES_PATH)/libcares.a: - $(MAKE) -C $(LIBCARES_PATH) -f Makefile.m32 -diff --git a/lib/Makefile.netware b/lib/Makefile.netware -index 672035c52..a4ec4c8f3 100644 ---- a/lib/Makefile.netware -+++ b/lib/Makefile.netware -@@ -6,7 +6,7 @@ - # \___|\___/|_| \_\_____| - # - # Copyright (C) 2004 - 2015, Guenter Knauf, <http://www.gknw.net/phpbb>. --# Copyright (C) 2001 - 2015, Daniel Stenberg, <dan...@haxx.se>, et al. -+# Copyright (C) 2001 - 2017, Daniel Stenberg, <dan...@haxx.se>, et al. - # - # This software is licensed as described in the file COPYING, which - # you should have received as part of this distribution. The terms -@@ -359,7 +359,7 @@ nlm: prebuild $(TARGET).nlm - - lib: prebuild $(TARGET).$(LIBEXT) - --prebuild: $(OBJDIR) $(CURL_INC)/curl/curlbuild.h $(OBJDIR)/version.inc curl_config.h -+prebuild: $(OBJDIR) $(OBJDIR)/version.inc curl_config.h - - $(OBJDIR)/%.o: %.c - # @echo Compiling $< -@@ -752,44 +752,6 @@ else - @echo IPv6 support: no - endif - --$(CURL_INC)/curl/curlbuild.h: Makefile.netware FORCE -- @echo Creating $@ -- @echo $(DL)/* $@ intended for NetWare target.$(DL) > $@ -- @echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@ -- @echo $(DL)** All your changes will be lost!!$(DL) >> $@ -- @echo $(DL)*/$(DL) >> $@ -- @echo $(DL)#ifndef NETWARE$(DL) >> $@ -- @echo $(DL)#error This $(notdir $@) is created for NetWare platform!$(DL) >> $@ -- @echo $(DL)#endif$(DL) >> $@ -- @echo $(DL)#ifndef __CURL_CURLBUILD_H$(DL) >> $@ -- @echo $(DL)#define __CURL_CURLBUILD_H$(DL) >> $@ --ifeq ($(LIBARCH),LIBC) -- @echo $(DL)#define CURL_SIZEOF_LONG 4$(DL) >> $@ -- @echo $(DL)#define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int$(DL) >> $@ -- @echo $(DL)#define CURL_SIZEOF_CURL_SOCKLEN_T 4$(DL) >> $@ -- @echo $(DL)#define CURL_TYPEOF_CURL_OFF_T long long$(DL) >> $@ -- @echo $(DL)#define CURL_FORMAT_CURL_OFF_T "lld"$(DL) >> $@ -- @echo $(DL)#define CURL_FORMAT_CURL_OFF_TU "llu"$(DL) >> $@ -- @echo $(DL)#define CURL_FORMAT_OFF_T "$(PCT)lld"$(DL) >> $@ -- @echo $(DL)#define CURL_SIZEOF_CURL_OFF_T 8$(DL) >> $@ -- @echo $(DL)#define CURL_SUFFIX_CURL_OFF_T LL$(DL) >> $@ -- @echo $(DL)#define CURL_SUFFIX_CURL_OFF_TU ULL$(DL) >> $@ --else -- @echo $(DL)#define CURL_SIZEOF_LONG 4$(DL) >> $@ -- @echo $(DL)#define CURL_TYPEOF_CURL_SOCKLEN_T int$(DL) >> $@ -- @echo $(DL)#define CURL_SIZEOF_CURL_SOCKLEN_T 4$(DL) >> $@ -- @echo $(DL)#define CURL_TYPEOF_CURL_OFF_T long$(DL) >> $@ -- @echo $(DL)#define CURL_FORMAT_CURL_OFF_T "ld"$(DL) >> $@ -- @echo $(DL)#define CURL_FORMAT_CURL_OFF_TU "lu"$(DL) >> $@ -- @echo $(DL)#define CURL_FORMAT_OFF_T "$(PCT)ld"$(DL) >> $@ -- @echo $(DL)#define CURL_SIZEOF_CURL_OFF_T 4$(DL) >> $@ -- @echo $(DL)#define CURL_SUFFIX_CURL_OFF_T L$(DL) >> $@ -- @echo $(DL)#define CURL_SUFFIX_CURL_OFF_TU UL$(DL) >> $@ --endif -- @echo $(DL)typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;$(DL) >> $@ -- @echo $(DL)typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;$(DL) >> $@ -- @echo $(DL)#endif /* __CURL_CURLBUILD_H */$(DL) >> $@ -- - $(LIBCARES_PATH)/libcares.$(LIBEXT): - $(MAKE) -C $(LIBCARES_PATH) -f Makefile.netware lib - -diff --git a/lib/curl_setup.h b/lib/curl_setup.h -index d22997cc9..6391dd6c8 100644 ---- a/lib/curl_setup.h -+++ b/lib/curl_setup.h -@@ -7,7 +7,7 @@ - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * -- * Copyright (C) 1998 - 2016, Daniel Stenberg, <dan...@haxx.se>, et al. -+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <dan...@haxx.se>, et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms -@@ -191,7 +191,7 @@ - - /* ================================================================ */ - /* No system header file shall be included in this file before this */ --/* point. The only allowed ones are those included from curlbuild.h */ -+/* point. The only allowed ones are those included from curl/system.h */ - /* ================================================================ */ - - /* -diff --git a/lib/makefile.dj b/lib/makefile.dj -index 2331afe31..067459d59 100644 ---- a/lib/makefile.dj -+++ b/lib/makefile.dj -@@ -6,7 +6,7 @@ - # \___|\___/|_| \_\_____| - # - # Copyright (C) 2003 - 2008, Gisle Vanem <gva...@yahoo.no>. --# Copyright (C) 2003 - 2015, Daniel Stenberg, <dan...@haxx.se>, et al. -+# Copyright (C) 2003 - 2017, Daniel Stenberg, <dan...@haxx.se>, et al. - # - # This software is licensed as described in the file COPYING, which - # you should have received as part of this distribution. The terms -@@ -37,9 +37,6 @@ OBJECTS = $(addprefix $(OBJ_DIR)/, $(notdir $(SOURCES:.c=.o))) - - CURL_LIB = libcurl.a - --# NOTE: if ../include/curl/curlbuild.h is missing, you're probably building --# this from a git checkout and then you need to run buildconf.bat first. -- - all: $(OBJ_DIR) curl_config.h $(CURL_LIB) - - $(CURL_LIB): $(OBJECTS) -diff --git a/packages/Android/Android.mk b/packages/Android/Android.mk -index 301ab9e7c..72f5e231f 100644 ---- a/packages/Android/Android.mk -+++ b/packages/Android/Android.mk -@@ -59,9 +59,8 @@ common_CFLAGS := -Wpointer-arith -Wwrite-strings -Wunused -Winline -Wnested-exte - include $(CLEAR_VARS) - include $(LOCAL_PATH)/lib/Makefile.inc - CURL_HEADERS := \ -- curlbuild.h \ - curl.h \ -- curlrules.h \ -+ system.h \ - curlver.h \ - easy.h \ - mprintf.h \ -diff --git a/packages/OS400/make-include.sh b/packages/OS400/make-include.sh -index ad72cf4a7..3c50d2d5f 100644 ---- a/packages/OS400/make-include.sh -+++ b/packages/OS400/make-include.sh -@@ -8,15 +8,6 @@ SCRIPTDIR=`dirname "${0}"` - cd "${TOPDIR}/include" - - --# Produce the curlbuild.h header file if not yet in distribution (CVS). -- --if action_needed curl/curlbuild.h --then if action_needed curl/curlbuild.h curl/curlbuild.h.dist -- then cp -p curl/curlbuild.h.dist curl/curlbuild.h -- fi --fi -- -- - # Create the OS/400 source program file for the header files. - - SRCPF="${LIBIFSNAME}/H.FILE" -diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c -index 89837bdc1..8ae635e43 100644 ---- a/packages/OS400/os400sys.c -+++ b/packages/OS400/os400sys.c -@@ -5,7 +5,7 @@ - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * -- * Copyright (C) 1998 - 2014, Daniel Stenberg, <dan...@haxx.se>, et al. -+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <dan...@haxx.se>, et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms -@@ -23,7 +23,7 @@ - - /* OS/400 additional support. */ - --#include "curlbuild.h" -+#include <curl/curl.h> - #include "config-os400.h" /* Not curl_setup.h: we only need some defines. */ - - #include <sys/types.h> -diff --git a/packages/vms/clean_gnv_curl.com b/packages/vms/clean_gnv_curl.com -index ba0173fe0..67b9d9db6 100644 ---- a/packages/vms/clean_gnv_curl.com -+++ b/packages/vms/clean_gnv_curl.com -@@ -105,9 +105,6 @@ $! - $ file = "lcl_root:[...]*.lai" - $ if f$search(file) .nes. "" then delete 'file';* - $! --$ file = "lcl_root:[.include.curl]curlbuild.h_old" --$ if f$search(file) .nes. "" then delete 'file';* --$! - $ file = "lcl_root:[.packages.vms]curl-*_original_src.bck" - $ if f$search(file) .nes. "" then delete 'file';* - $! -@@ -166,9 +163,6 @@ $! - $ file = "lcl_root:[]config.h" - $ if f$search(file) .nes. "" then delete 'file';* - $! --$ file = "lcl_root:[.include.curl]curlbuild.h" --$ if f$search(file) .nes. "" then delete 'file';* --$! - $ file = "lcl_root:[.src]config.h" - $ if f$search(file) .nes. "" then delete 'file';* - $! -diff --git a/packages/vms/pcsi_gnv_curl_file_list.txt b/packages/vms/pcsi_gnv_curl_file_list.txt -index ab5b633dc..07539b2cd 100644 ---- a/packages/vms/pcsi_gnv_curl_file_list.txt -+++ b/packages/vms/pcsi_gnv_curl_file_list.txt -@@ -58,8 +58,7 @@ - [gnv.usr.bin]curl-config. - [gnv.usr.bin]gnv$curl.exe - [gnv.usr.include.curl]curl.h --[gnv.usr.include.curl]curlbuild.h --[gnv.usr.include.curl]curlrules.h -+[gnv.usr.include.curl]system.h - [gnv.usr.include.curl]curlver.h - [gnv.usr.include.curl]easy.h - [gnv.usr.include.curl]mprintf.h -diff --git a/packages/vms/stage_curl_install.com b/packages/vms/stage_curl_install.com -index 0dccdd6af..84540d739 100644 ---- a/packages/vms/stage_curl_install.com -+++ b/packages/vms/stage_curl_install.com -@@ -11,8 +11,6 @@ $! [usr.bin]curl-config. - $! [usr.lib]gnv$libcurl.exe - $! [usr.bin]curl. hard link for [usr.bin]gnv$curl.exe - $! [usr.include.curl]curl.h --$! [usr.include.curl]curlbuild.h --$! [usr.include.curl]curlrules.h - $! [usr.include.curl]curlver.h - $! [usr.include.curl]easy.h - $! [usr.include.curl]mprintf.h -@@ -132,10 +130,8 @@ $! - $ if remove_files .eq. 0 - $ then - $ copy [--.include.curl]curl.h 'new_gnu'[usr.include.curl]curl.h --$ copy [--.include.curl]curlbuild.h - -- 'new_gnu'[usr.include.curl]curlbuild.h --$ copy [--.include.curl]curlrules.h - -- 'new_gnu'[usr.include.curl]curlrules.h -+$ copy [--.include.curl]system.h - -+ 'new_gnu'[usr.include.curl]system.h - $ copy [--.include.curl]curlver.h - - 'new_gnu'[usr.include.curl]curlver.h - $ copy [--.include.curl]easy.h - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e6004ceae..de188be66 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/curlbuild.h" -+ ${CURL_BINARY_DIR}/include # To be able to reach "curl/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 950a7ba22..9c20e3445 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -29,17 +29,13 @@ AUTOMAKE_OPTIONS = foreign nostdinc - # being currently built and tested are searched before the library which - # might possibly already be installed in the system. - # --# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h --# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h - # $(top_srcdir)/include is for libcurl's external include files - # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file - # $(top_builddir)/src is for curl's generated src/curl_config.h file - # $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files - # $(top_srcdir)/src is for curl's src/tool_setup.h and "curl-private" files - --AM_CPPFLAGS = -I$(top_builddir)/include/curl \ -- -I$(top_builddir)/include \ -- -I$(top_srcdir)/include \ -+AM_CPPFLAGS = -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_builddir)/src \ - -I$(top_srcdir)/lib \ -diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc -index 155320aa5..715b5e839 100644 ---- a/tests/data/Makefile.inc -+++ b/tests/data/Makefile.inc -@@ -164,8 +164,7 @@ test1520 test1521 \ - \ - test1525 test1526 test1527 test1528 test1529 test1530 test1531 test1532 \ - test1533 test1534 test1535 test1536 test1537 test1538 \ --test1540 test1541 \ --\ -+test1540 \ - test1600 test1601 test1602 test1603 test1604 test1605 test1606 \ - \ - test1700 test1701 test1702 \ -diff --git a/tests/data/test1541 b/tests/data/test1541 -deleted file mode 100644 -index 3d04cb4f9..000000000 ---- a/tests/data/test1541 -+++ /dev/null -@@ -1,22 +0,0 @@ --<testcase> --<info> --<keywords> --typecheck --</keywords> --</info> -- --# --# Client-side --<client> --<server> --none --</server> -- <name> --verify curl/system.h detection -- </name> --<tool> --lib1541 --</tool> --</client> -- --</testcase> -diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt -index a7449c374..2f61599ea 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/curlbuild.h" -+ ${CURL_BINARY_DIR}/include # To be able to reach "curl/curl.h" - ) - if(USE_ARES) - include_directories(${CARES_INCLUDE_DIR}) -diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am -index ee29ab7db..e3d02be57 100644 ---- a/tests/libtest/Makefile.am -+++ b/tests/libtest/Makefile.am -@@ -26,8 +26,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc - # being currently built and tested are searched before the library which - # might possibly already be installed in the system. - # --# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h --# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h - # $(top_srcdir)/include is for libcurl's external include files - # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file - # $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files -@@ -35,17 +33,13 @@ AUTOMAKE_OPTIONS = foreign nostdinc - # $(top_srcdir)/ares is for in-tree c-ares's external include files - - if USE_EMBEDDED_ARES --AM_CPPFLAGS = -I$(top_builddir)/include/curl \ -- -I$(top_builddir)/include \ -- -I$(top_srcdir)/include \ -+AM_CPPFLAGS = -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/ares \ - -I$(top_srcdir)/ares - else --AM_CPPFLAGS = -I$(top_builddir)/include/curl \ -- -I$(top_builddir)/include \ -- -I$(top_srcdir)/include \ -+AM_CPPFLAGS = -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib - endif -diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc -index 78e90bb73..e858cccfa 100644 ---- a/tests/libtest/Makefile.inc -+++ b/tests/libtest/Makefile.inc -@@ -25,7 +25,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ - lib1520 lib1521 \ - lib1525 lib1526 lib1527 lib1528 lib1529 lib1530 lib1531 lib1532 lib1533 \ - lib1534 lib1535 lib1536 lib1537 lib1538 \ -- lib1540 lib1541 \ -+ lib1540 \ - lib1900 \ - lib2033 - -@@ -431,10 +431,6 @@ lib1540_SOURCES = lib1540.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) - lib1540_LDADD = $(TESTUTIL_LIBS) - lib1540_CPPFLAGS = $(AM_CPPFLAGS) - --lib1541_SOURCES = lib1541.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) --lib1541_LDADD = $(TESTUTIL_LIBS) --lib1541_CPPFLAGS = $(AM_CPPFLAGS) -- - lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) - lib1900_LDADD = $(TESTUTIL_LIBS) - lib1900_CPPFLAGS = $(AM_CPPFLAGS) -diff --git a/tests/libtest/lib1541.c b/tests/libtest/lib1541.c -deleted file mode 100644 -index 3675592ff..000000000 ---- a/tests/libtest/lib1541.c -+++ /dev/null -@@ -1,129 +0,0 @@ --/*************************************************************************** -- * _ _ ____ _ -- * Project ___| | | | _ \| | -- * / __| | | | |_) | | -- * | (__| |_| | _ <| |___ -- * \___|\___/|_| \_\_____| -- * -- * Copyright (C) 1998 - 2017, Daniel Stenberg, <dan...@haxx.se>, et al. -- * -- * This software is licensed as described in the file COPYING, which -- * you should have received as part of this distribution. The terms -- * 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. -- * -- ***************************************************************************/ --#include "test.h" -- --#include "testutil.h" --#include "warnless.h" --#include "memdebug.h" -- --#define XSTR(x) #x --#define STRING(y) XSTR(y) -- --int test(char *URL) --{ -- char detect[512]; -- char syst[512]; -- -- const char *types_h = "No"; -- const char *socket_h = "No"; -- const char *ws2tcpip_h = "No"; -- const char *stypes_h = "No"; -- const char *ssocket_h = "No"; -- const char *sws2tcpip_h = "No"; -- -- (void)(URL); -- --#ifdef CURL_PULL_SYS_TYPES_H -- types_h = "Yes"; --#endif --#ifdef CURL_PULL_SYS_SOCKET_H -- socket_h = "Yes"; --#endif --#ifdef CURL_PULL_WS2TCPIP_H -- ws2tcpip_h = "Yes"; --#endif -- snprintf(detect, sizeof(detect), --#ifdef CHECK_CURL_OFF_T -- "CURL_TYPEOF_CURL_OFF_T: %s\n" --#endif -- "CURL_FORMAT_CURL_OFF_T: %s\n" -- "CURL_FORMAT_CURL_OFF_TU: %s\n" -- "CURL_SUFFIX_CURL_OFF_T: %s\n" -- "CURL_SUFFIX_CURL_OFF_TU: %s\n" -- "CURL_SIZEOF_CURL_OFF_T: %d\n" -- "CURL_SIZEOF_LONG: %d\n" -- "CURL_TYPEOF_CURL_SOCKLEN_T: %s\n" -- "CURL_PULL_SYS_TYPES_H: %s\n" -- "CURL_PULL_SYS_SOCKET_H: %s\n" -- "CURL_PULL_WS2TCPIP_H: %s\n" -- --#ifdef CHECK_CURL_OFF_T -- , STRING(CURL_TYPEOF_CURL_OFF_T) --#endif -- , CURL_FORMAT_CURL_OFF_T -- , CURL_FORMAT_CURL_OFF_TU -- , STRING(CURL_SUFFIX_CURL_OFF_T) -- , STRING(CURL_SUFFIX_CURL_OFF_TU) -- , CURL_SIZEOF_CURL_OFF_T -- , CURL_SIZEOF_LONG -- , STRING(CURL_TYPEOF_CURL_SOCKLEN_T) -- , types_h -- , socket_h -- , ws2tcpip_h); -- --#ifdef CURLSYS_PULL_SYS_TYPES_H -- stypes_h = "Yes"; --#endif --#ifdef CURLSYS_PULL_SYS_SOCKET_H -- ssocket_h = "Yes"; --#endif --#ifdef CURLSYS_PULL_WS2TCPIP_H -- sws2tcpip_h = "Yes"; --#endif -- snprintf(syst, sizeof(syst), --#ifdef CHECK_CURL_OFF_T -- "CURL_TYPEOF_CURL_OFF_T: %s\n" --#endif -- "CURL_FORMAT_CURL_OFF_T: %s\n" -- "CURL_FORMAT_CURL_OFF_TU: %s\n" -- "CURL_SUFFIX_CURL_OFF_T: %s\n" -- "CURL_SUFFIX_CURL_OFF_TU: %s\n" -- "CURL_SIZEOF_CURL_OFF_T: %d\n" -- "CURL_SIZEOF_LONG: %d\n" -- "CURL_TYPEOF_CURL_SOCKLEN_T: %s\n" -- "CURL_PULL_SYS_TYPES_H: %s\n" -- "CURL_PULL_SYS_SOCKET_H: %s\n" -- "CURL_PULL_WS2TCPIP_H: %s\n" -- --#ifdef CHECK_CURL_OFF_T -- , STRING(CURLSYS_TYPEOF_CURL_OFF_T) --#endif -- , CURLSYS_FORMAT_CURL_OFF_T -- , CURLSYS_FORMAT_CURL_OFF_TU -- , STRING(CURLSYS_SUFFIX_CURL_OFF_T) -- , STRING(CURLSYS_SUFFIX_CURL_OFF_TU) -- , CURLSYS_SIZEOF_CURL_OFF_T -- , CURLSYS_SIZEOF_LONG -- , STRING(CURLSYS_TYPEOF_CURL_SOCKLEN_T) -- , stypes_h -- , ssocket_h -- , sws2tcpip_h); -- -- if(strcmp(detect, syst)) { -- printf("===> Type detection failed <====\n"); -- printf("[Detected]\n%s", detect); -- printf("[System]\n%s", syst); -- return 1; /* FAIL! */ -- } -- -- return 0; --} -diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt -index 00f5242f9..e456a94df 100644 ---- a/tests/server/CMakeLists.txt -+++ b/tests/server/CMakeLists.txt -@@ -7,7 +7,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/curlbuild.h" -+ ${CURL_BINARY_DIR}/include # To be able to reach "curl/curl.h" - ) - if(USE_ARES) - include_directories(${CARES_INCLUDE_DIR}) -diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am -index 620403815..f2067f2e2 100644 ---- a/tests/server/Makefile.am -+++ b/tests/server/Makefile.am -@@ -26,8 +26,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc - # being currently built and tested are searched before the library which - # might possibly already be installed in the system. - # --# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h --# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h - # $(top_srcdir)/include is for libcurl's external include files - # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file - # $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files -@@ -35,17 +33,13 @@ AUTOMAKE_OPTIONS = foreign nostdinc - # $(top_srcdir)/ares is for in-tree c-ares's external include files - - if USE_EMBEDDED_ARES --AM_CPPFLAGS = -I$(top_builddir)/include/curl \ -- -I$(top_builddir)/include \ -- -I$(top_srcdir)/include \ -+AM_CPPFLAGS = -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/ares \ - -I$(top_srcdir)/ares - else --AM_CPPFLAGS = -I$(top_builddir)/include/curl \ -- -I$(top_builddir)/include \ -- -I$(top_srcdir)/include \ -+AM_CPPFLAGS = -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib - endif -diff --git a/tests/testcurl.pl b/tests/testcurl.pl -index dc35a026d..9749bc7d1 100755 ---- a/tests/testcurl.pl -+++ b/tests/testcurl.pl -@@ -6,7 +6,7 @@ - # | (__| |_| | _ <| |___ - # \___|\___/|_| \_\_____| - # --# Copyright (C) 1998 - 2015, Daniel Stenberg, <dan...@haxx.se>, et al. -+# Copyright (C) 1998 - 2017, Daniel Stenberg, <dan...@haxx.se>, et al. - # - # This software is licensed as described in the file COPYING, which - # you should have received as part of this distribution. The terms -@@ -588,7 +588,6 @@ if ($configurebuild) { - elsif ($^O eq 'linux') { - system("cp -afr $CURLDIR/* ."); - system("cp -af $CURLDIR/Makefile.dist Makefile"); -- system("cp -af $CURLDIR/include/curl/curlbuild.h.dist ./include/curl/curlbuild.h"); - system("$make -i -C lib -f Makefile.$targetos prebuild"); - system("$make -i -C src -f Makefile.$targetos prebuild"); - if (-d "$CURLDIR/ares") { -@@ -609,20 +608,6 @@ if(-f "./libcurl.pc") { - } - } - --if(-f "./include/curl/curlbuild.h") { -- logit_spaced "display include/curl/curlbuild.h"; -- if(open(F, "<./include/curl/curlbuild.h")) { -- while(<F>) { -- my $ll = $_; -- print $ll if(($ll =~ /^ *# *define *CURL_/) && ($ll !~ /__CURL_CURLBUILD_H/)); -- } -- close(F); -- } --} --else { -- mydie "no curlbuild.h created/found"; --} -- - logit_spaced "display lib/$confheader"; - open(F, "lib/$confheader") or die "lib/$confheader: $!"; - while (<F>) { -diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt -index 14589d68d..a29991215 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/curlbuild.h" -+ ${CURL_BINARY_DIR}/include # To be able to reach "curl/curl.h" - ) - - foreach(_testfile ${UT_SRC}) -diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am -index 6dc2a17c1..61b72c0db 100644 ---- a/tests/unit/Makefile.am -+++ b/tests/unit/Makefile.am -@@ -5,7 +5,7 @@ - # | (__| |_| | _ <| |___ - # \___|\___/|_| \_\_____| - # --# Copyright (C) 1998 - 2016, Daniel Stenberg, <dan...@haxx.se>, et al. -+# Copyright (C) 1998 - 2017, Daniel Stenberg, <dan...@haxx.se>, et al. - # - # This software is licensed as described in the file COPYING, which - # you should have received as part of this distribution. The terms -@@ -26,8 +26,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc - # being currently built and tested are searched before the library which - # might possibly already be installed in the system. - # --# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h --# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h - # $(top_srcdir)/include is for libcurl's external include files - # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file - # $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files -@@ -35,9 +33,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc - # $(top_srcdir)/ares is for in-tree c-ares's external include files - - if USE_EMBEDDED_ARES --AM_CPPFLAGS = -I$(top_builddir)/include/curl \ -- -I$(top_builddir)/include \ -- -I$(top_srcdir)/include \ -+AM_CPPFLAGS = -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/src \ -@@ -45,9 +41,7 @@ AM_CPPFLAGS = -I$(top_builddir)/include/curl \ - -I$(top_builddir)/ares \ - -I$(top_srcdir)/ares - else --AM_CPPFLAGS = -I$(top_builddir)/include/curl \ -- -I$(top_builddir)/include \ -- -I$(top_srcdir)/include \ -+AM_CPPFLAGS = -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/src \ -diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc -index 9ef7c1457..ba73efde9 100644 ---- a/winbuild/Makefile.vc -+++ b/winbuild/Makefile.vc -@@ -223,9 +223,6 @@ CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl - DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\ - - $(MODE): -- @IF NOT EXIST ..\include\curl\curlbuild.h ( \ -- CALL ..\buildconf.bat \ -- ) - @SET DIROBJ=$(LIBCURL_DIROBJ) - @SET MACRO_NAME=LIBCURL_OBJS - @SET OUTFILE=LIBCURL_OBJS.inc --- -2.13.2 -