Browse Source

includes: remove curl/curlbuild.h and curl/curlrules.h

Rely entirely on curl/system.h now.

Introduced in Aug 2008 with commit 14240e9e10. Now gone.

Fixes #1456
tags/curl-7_55_0
Daniel Stenberg 2 years ago
parent
commit
73a2fcea0b

+ 4
- 10
CMakeLists.txt View File

@@ -5,7 +5,7 @@
5 5
 #                            | (__| |_| |  _ <| |___
6 6
 #                             \___|\___/|_| \_\_____|
7 7
 #
8
-# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
8
+# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
9 9
 #
10 10
 # This software is licensed as described in the file COPYING, which
11 11
 # you should have received as part of this distribution. The terms
@@ -1111,7 +1111,7 @@ else()
1111 1111
   set(CURL_SIZEOF_CURL_SOCKLEN_T ${SIZEOF_INT})
1112 1112
 endif()
1113 1113
 
1114
-# TODO test which of these headers are required for the typedefs used in curlbuild.h
1114
+# TODO test which of these headers are required
1115 1115
 if(WIN32)
1116 1116
   set(CURL_PULL_WS2TCPIP_H ${HAVE_WS2TCPIP_H})
1117 1117
 else()
@@ -1297,16 +1297,10 @@ if(NOT CURL_CONFIG_HAS_BEEN_RUN_BEFORE)
1297 1297
   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")
1298 1298
 endif()
1299 1299
 
1300
-# Installation.
1301
-# First, install generated curlbuild.h
1302
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/curl/curlbuild.h"
1303
-    DESTINATION include/curl )
1304
-# Next, install other headers excluding curlbuild.h
1300
+# install headers
1305 1301
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/curl"
1306 1302
     DESTINATION include
1307
-    FILES_MATCHING PATTERN "*.h"
1308
-    PATTERN "curlbuild.h" EXCLUDE)
1309
-
1303
+    FILES_MATCHING PATTERN "*.h")
1310 1304
 
1311 1305
 # Workaround for MSVS10 to avoid the Dialog Hell
1312 1306
 # FIXME: This could be removed with future version of CMake.

+ 0
- 9
MacOSX-Framework View File

@@ -126,15 +126,6 @@ if test ! -z $SDK32; then
126 126
     pwd
127 127
     lipo libcurl.framework/${FRAMEWORK_VERSION}/libcurl32 libcurl.framework/${FRAMEWORK_VERSION}/libcurl64 -create -output libcurl.framework/${FRAMEWORK_VERSION}/libcurl
128 128
     rm libcurl.framework/${FRAMEWORK_VERSION}/libcurl32 libcurl.framework/${FRAMEWORK_VERSION}/libcurl64
129
-    cp libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl/curlbuild.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl/curlbuild32.h
130
-    cp include/curl/curlbuild.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl/curlbuild64.h
131
-    cat >libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl/curlbuild.h <<EOF
132
-#ifdef __LP64__
133
-#include "curl/curlbuild64.h"
134
-#else
135
-#include "curl/curlbuild32.h"
136
-#endif
137
-EOF
138 129
   fi
139 130
 
140 131
   pwd

+ 1
- 1
Makefile.am View File

@@ -27,7 +27,7 @@ ACLOCAL_AMFLAGS = -I m4
27 27
 CMAKE_DIST = CMakeLists.txt CMake/CMakeConfigurableFile.in      \
28 28
  CMake/CurlTests.c CMake/FindGSS.cmake CMake/OtherTests.cmake   \
29 29
  CMake/Platforms/WindowsCache.cmake CMake/Utilities.cmake       \
30
- include/curl/curlbuild.h.cmake CMake/Macros.cmake              \
30
+ CMake/Macros.cmake              \
31 31
  CMake/CurlSymbolHiding.cmake CMake/FindCARES.cmake             \
32 32
  CMake/FindLibSSH2.cmake CMake/FindNGHTTP2.cmake                \
33 33
  CMake/FindMbedTLS.cmake

+ 3
- 15
acinclude.m4 View File

@@ -5,7 +5,7 @@
5 5
 #                            | (__| |_| |  _ <| |___
6 6
 #                             \___|\___/|_| \_\_____|
7 7
 #
8
-# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
8
+# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
9 9
 #
10 10
 # This software is licensed as described in the file COPYING, which
11 11
 # you should have received as part of this distribution. The terms
@@ -2079,10 +2079,7 @@ _EOF
2079 2079
 dnl CURL_CONFIGURE_LONG
2080 2080
 dnl -------------------------------------------------
2081 2081
 dnl Find out the size of long as reported by sizeof() and define
2082
-dnl CURL_SIZEOF_LONG as appropriate to be used in template file
2083
-dnl include/curl/curlbuild.h.in to properly configure the library.
2084
-dnl The size of long is a build time characteristic and as such
2085
-dnl must be recorded in curlbuild.h
2082
+dnl CURL_SIZEOF_LONG.
2086 2083
 
2087 2084
 AC_DEFUN([CURL_CONFIGURE_LONG], [
2088 2085
   if test -z "$ac_cv_sizeof_long" ||
@@ -2095,10 +2092,6 @@ AC_DEFUN([CURL_CONFIGURE_LONG], [
2095 2092
 
2096 2093
 dnl CURL_CONFIGURE_CURL_SOCKLEN_T
2097 2094
 dnl -------------------------------------------------
2098
-dnl Find out suitable curl_socklen_t data type definition and size, making
2099
-dnl appropriate definitions for template file include/curl/curlbuild.h.in
2100
-dnl to properly configure and use the library.
2101
-dnl
2102 2095
 dnl The need for the curl_socklen_t definition arises mainly to properly
2103 2096
 dnl interface HP-UX systems which on one hand have a typedef'ed socklen_t
2104 2097
 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], [
2222 2215
 
2223 2216
 dnl CURL_CONFIGURE_PULL_SYS_POLL
2224 2217
 dnl -------------------------------------------------
2225
-dnl Find out if system header file sys/poll.h must be included by the
2226
-dnl external interface, making appropriate definitions for template file
2227
-dnl include/curl/curlbuild.h.in to properly configure and use the library.
2228
-dnl
2229 2218
 dnl The need for the sys/poll.h inclusion arises mainly to properly
2230 2219
 dnl interface AIX systems which define macros 'events' and 'revents'.
2231 2220
 
@@ -2859,8 +2848,7 @@ AC_DEFUN([DO_CURL_OFF_T_SUFFIX_CHECK], [
2859 2848
 dnl CURL_CONFIGURE_CURL_OFF_T
2860 2849
 dnl -------------------------------------------------
2861 2850
 dnl Find out suitable curl_off_t data type definition and associated
2862
-dnl items, and make the appropriate definitions used in template file
2863
-dnl include/curl/curlbuild.h.in to properly configure the library.
2851
+dnl items
2864 2852
 
2865 2853
 AC_DEFUN([CURL_CONFIGURE_CURL_OFF_T], [
2866 2854
   AC_REQUIRE([CURL_INCLUDES_INTTYPES])dnl

+ 0
- 1
buildconf View File

@@ -306,7 +306,6 @@ for fname in .deps \
306 306
     configure \
307 307
     configurehelp.pm \
308 308
     curl-config \
309
-    curlbuild.h \
310 309
     depcomp \
311 310
     libcares.pc \
312 311
     libcurl.pc \

+ 1
- 34
buildconf.bat View File

@@ -6,7 +6,7 @@ rem *                             / __| | | | |_) | |
6 6
 rem *                            | (__| |_| |  _ <| |___
7 7
 rem *                             \___|\___/|_| \_\_____|
8 8
 rem *
9
-rem * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
9
+rem * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
10 10
 rem *
11 11
 rem * This software is licensed as described in the file COPYING, which
12 12
 rem * you should have received as part of this distribution. The terms
@@ -73,7 +73,6 @@ rem
73 73
     echo Generating prerequisite files
74 74
 
75 75
     call :generate
76
-    if errorlevel 4 goto nogencurlbuild
77 76
     if errorlevel 3 goto nogenhugehelp
78 77
     if errorlevel 2 goto nogenmakefile
79 78
     if errorlevel 1 goto warning
@@ -83,7 +82,6 @@ rem
83 82
     echo Removing prerequisite files
84 83
 
85 84
     call :clean
86
-    if errorlevel 3 goto nocleancurlbuild
87 85
     if errorlevel 2 goto nocleanhugehelp
88 86
     if errorlevel 1 goto nocleanmakefile
89 87
   )
@@ -98,7 +96,6 @@ rem 0 - success
98 96
 rem 1 - success with simplified tool_hugehelp.c 
99 97
 rem 2 - failed to generate Makefile
100 98
 rem 3 - failed to generate tool_hugehelp.c
101
-rem 4 - failed to generate curlbuild.h
102 99
 rem
103 100
 :generate
104 101
   if "%OS%" == "Windows_NT" setlocal
@@ -126,16 +123,6 @@ rem
126 123
   )
127 124
   cmd /c exit 0
128 125
 
129
-  rem Create curlbuild.h
130
-  echo * %CD%\include\curl\curlbuild.h
131
-  if exist include\curl\curlbuild.h.dist (
132
-    copy /Y include\curl\curlbuild.h.dist include\curl\curlbuild.h 1>NUL 2>&1
133
-    if errorlevel 1 (
134
-      if "%OS%" == "Windows_NT" endlocal
135
-      exit /B 4
136
-    )
137
-  )
138
-
139 126
   rem Setup c-ares git tree
140 127
   if exist ares\buildconf.bat (
141 128
     echo.
@@ -160,7 +147,6 @@ rem
160 147
 rem 0 - success
161 148
 rem 1 - failed to clean Makefile
162 149
 rem 2 - failed to clean tool_hugehelp.c
163
-rem 3 - failed to clean curlbuild.h
164 150
 rem
165 151
 :clean
166 152
   rem Remove Makefile
@@ -181,15 +167,6 @@ rem
181 167
     )
182 168
   )
183 169
 
184
-  rem Remove curlbuild.h
185
-  echo * %CD%\include\curl\curlbuild.h
186
-  if exist include\curl\curlbuild.h (
187
-    del include\curl\curlbuild.h 2>NUL
188
-    if exist include\curl\curlbuild.h (
189
-      exit /B 3
190
-    )
191
-  )
192
-
193 170
   exit /B
194 171
 
195 172
 rem Function to generate src\tool_hugehelp.c
@@ -304,11 +281,6 @@ rem
304 281
   echo Error: Unable to generate src\tool_hugehelp.c
305 282
   goto error
306 283
 
307
-:nogencurlbuild
308
-  echo.
309
-  echo Error: Unable to generate include\curl\curlbuild.h
310
-  goto error
311
-
312 284
 :nocleanmakefile
313 285
   echo.
314 286
   echo Error: Unable to clean Makefile
@@ -319,11 +291,6 @@ rem
319 291
   echo Error: Unable to clean src\tool_hugehelp.c
320 292
   goto error
321 293
 
322
-:nocleancurlbuild
323
-  echo.
324
-  echo Error: Unable to clean include\curl\curlbuild.h
325
-  goto error
326
-
327 294
 :warning
328 295
   echo.
329 296
   echo Warning: The curl manual could not be integrated in the source. This means when

+ 1
- 6
configure.ac View File

@@ -36,7 +36,7 @@ This configure script may be copied, distributed and modified under the
36 36
 terms of the curl license; see COPYING for more details])
37 37
 
38 38
 AC_CONFIG_SRCDIR([lib/urldata.h])
39
-AC_CONFIG_HEADERS(lib/curl_config.h include/curl/curlbuild.h)
39
+AC_CONFIG_HEADERS(lib/curl_config.h)
40 40
 AC_CONFIG_MACRO_DIR([m4])
41 41
 AM_MAINTAINER_MODE
42 42
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -121,11 +121,6 @@ AC_SUBST([AR])
121 121
 
122 122
 AC_SUBST(libext)
123 123
 
124
-dnl Remove non-configure distributed curlbuild.h
125
-if test -f ${srcdir}/include/curl/curlbuild.h; then
126
-  rm -f ${srcdir}/include/curl/curlbuild.h
127
-fi
128
-
129 124
 dnl figure out the libcurl version
130 125
 CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)".*/\1/p' ${srcdir}/include/curl/curlver.h`
131 126
 XC_CHECK_PROG_CC

+ 0
- 27
docs/FAQ View File

@@ -30,7 +30,6 @@ FAQ
30 30
   2.2 Does curl work/build with other SSL libraries?
31 31
   2.3 Where can I find a copy of LIBEAY32.DLL?
32 32
   2.4 Does curl support SOCKS (RFC 1928) ?
33
-  2.5 Install libcurl for both 32bit and 64bit?
34 33
 
35 34
  3. Usage Problems
36 35
   3.1 curl: (1) SSL is disabled, https: not supported
@@ -466,32 +465,6 @@ FAQ
466 465
 
467 466
   Yes, SOCKS 4 and 5 are supported.
468 467
 
469
-  2.5 Install libcurl for both 32bit and 64bit?
470
-
471
-  In curl's configure procedure one of the regular include files gets created
472
-  with platform specific information. The file 'curl/curlbuild.h' in the
473
-  installed libcurl file tree is therefore somewhat tied to that particular
474
-  platform.
475
-
476
-  To allow applications to get built for either 32bit or 64bit you need to
477
-  install libcurl headers for both setups and unfortunately curl doesn't do
478
-  this automatically.
479
-
480
-  A commonly used procedure is this:
481
-
482
-     $ ./configure [32bit platform]
483
-     $ mv curl/curlbuild.h curl/curlbuild-32bit.h
484
-     $ ./configure [64bit platform]
485
-     $ mv curl/curlbuild.h curl/curlbuild-64bit.h
486
-
487
-  Then you make a toplevel curl/curlbuild.h replacement that only does this:
488
-
489
-     #ifdef IS_32BIT
490
-     #include "curlbuild-32bit.h"
491
-     else
492
-     #include "curlbuild-64bit.h"
493
-     #endif
494
-
495 468
 
496 469
 3. Usage problems
497 470
 

+ 0
- 11
docs/INSTALL.cmake View File

@@ -37,17 +37,6 @@ Current flaws in the curl CMake build
37 37
    - Does't detect the correct strerror_r flavor when cross-compiling (issue #1123)
38 38
 
39 39
 
40
-Important notice
41
-==================
42
-   If you got your curl sources from a distribution tarball, make sure to
43
-   delete the generic 'include/curl/curlbuild.h' file that comes with it:
44
-       rm -f curl/include/curl/curlbuild.h
45
-
46
-   The purpose of this file is to provide reasonable definitions for systems
47
-   where autoconfiguration is not available. CMake will create its own
48
-   version of this file in its build directory. If the "generic" version
49
-   is not deleted, weird build errors may occur on some systems.
50
-
51 40
 Command Line CMake
52 41
 ==================
53 42
    A CMake build of curl is similar to the autotools build of curl. It

+ 2
- 6
docs/examples/Makefile.am View File

@@ -5,7 +5,7 @@
5 5
 #                            | (__| |_| |  _ <| |___
6 6
 #                             \___|\___/|_| \_\_____|
7 7
 #
8
-# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
8
+# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
9 9
 #
10 10
 # This software is licensed as described in the file COPYING, which
11 11
 # you should have received as part of this distribution. The terms
@@ -30,13 +30,9 @@ EXTRA_DIST = README Makefile.example Makefile.inc Makefile.m32 \
30 30
 # being currently built and tested are searched before the library which
31 31
 # might possibly already be installed in the system.
32 32
 #
33
-# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
34
-# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h
35 33
 # $(top_srcdir)/include is for libcurl's external include files
36 34
 
37
-AM_CPPFLAGS = -I$(top_builddir)/include/curl \
38
-              -I$(top_builddir)/include      \
39
-              -I$(top_srcdir)/include
35
+AM_CPPFLAGS = -I$(top_srcdir)/include
40 36
 
41 37
 LIBDIR = $(top_builddir)/lib
42 38
 

+ 2
- 24
include/README View File

@@ -16,31 +16,9 @@ curl subdirectory. It makes it more likely to survive future modifications.
16 16
 
17 17
 NOTE FOR LIBCURL HACKERS
18 18
 
19
-The following notes apply to libcurl version 7.19.0 and later.
20
-
21
-* The distributed curl/curlbuild.h file is only intended to be used on systems
22
-  which can not run the also distributed configure script.
23
-
24
-* The distributed curlbuild.h file is generated as a copy of curlbuild.h.dist
25
-  when the libcurl source code distribution archive file is originally created.
26
-
27 19
 * If you check out from git on a non-configure platform, you must run the
28
-  appropriate buildconf* script to set up curlbuild.h and other local files
29
-  before being able of compiling the library.
30
-
31
-* On systems capable of running the configure script, the configure process
32
-  will overwrite the distributed include/curl/curlbuild.h file with one that
33
-  is suitable and specific to the library being configured and built, which
34
-  is generated from the include/curl/curlbuild.h.in template file.
35
-
36
-* If you intend to distribute an already compiled libcurl library you _MUST_
37
-  also distribute along with it the generated curl/curlbuild.h which has been
38
-  used to compile it. Otherwise the library will be of no use for the users of
39
-  the library that you have built. It is _your_ responsibility to provide this
40
-  file. No one at the curl project can know how you have built the library.
41
-
42
-* File curl/curlbuild.h includes platform and configuration dependent info,
43
-  and must not be modified by anyone. Configure script generates it for you.
20
+  appropriate buildconf* script to set up files before being able of compiling
21
+  the library.
44 22
 
45 23
 * We cannot assume anything else but very basic compiler features being
46 24
   present. While libcurl requires an ANSI C compiler to build, some of the

+ 0
- 1
include/curl/.gitignore View File

@@ -1,4 +1,3 @@
1
-curlbuild.h
2 1
 curlver.h.dist
3 2
 stamp-h2
4 3
 stamp-h3

+ 2
- 21
include/curl/Makefile.am View File

@@ -21,31 +21,12 @@
21 21
 ###########################################################################
22 22
 pkginclude_HEADERS = \
23 23
 	curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \
24
-	typecheck-gcc.h curlbuild.h curlrules.h system.h
24
+	typecheck-gcc.h system.h
25 25
 
26 26
 pkgincludedir= $(includedir)/curl
27 27
 
28
-# curlbuild.h does not exist in the git tree. When the original libcurl
29
-# source code distribution archive file is created, curlbuild.h.dist is
30
-# renamed to curlbuild.h and included in the tarball so that it can be
31
-# used directly on non-configure systems.
32
-#
33
-# The distributed curlbuild.h will be overwritten on configure systems
34
-# when the configure script runs, with one that is suitable and specific
35
-# to the library being configured and built.
36
-#
37
-# curlbuild.h.in is the distributed template file from which the configure
38
-# script creates curlbuild.h at library configuration time, overwiting the
39
-# one included in the distribution archive.
40
-#
41
-# curlbuild.h.dist is not included in the source code distribution archive.
42
-
43
-EXTRA_DIST = curlbuild.h.in
44
-
45
-DISTCLEANFILES = curlbuild.h
46
-
47 28
 checksrc:
48
-	@@PERL@ $(top_srcdir)/lib/checksrc.pl -Wcurlbuild.h -D$(top_srcdir)/include/curl $(pkginclude_HEADERS) $(EXTRA_DIST)
29
+	@@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/include/curl $(pkginclude_HEADERS)
49 30
 
50 31
 if CURLDEBUG
51 32
 # for debug builds, we scan the sources on all regular make invokes

+ 0
- 2
include/curl/curl.h View File

@@ -36,8 +36,6 @@
36 36
 
37 37
 #include "curlver.h"         /* libcurl version defines   */
38 38
 #include "system.h"          /* determine things run-time */
39
-#include "curlbuild.h"       /* libcurl build definitions */
40
-#include "curlrules.h"       /* libcurl rules enforcement */
41 39
 
42 40
 /*
43 41
  * Define WIN32 when build target is Win32 API

+ 0
- 197
include/curl/curlbuild.h.cmake View File

@@ -1,197 +0,0 @@
1
-#ifndef __CURL_CURLBUILD_H
2
-#define __CURL_CURLBUILD_H
3
-/***************************************************************************
4
- *                                  _   _ ____  _
5
- *  Project                     ___| | | |  _ \| |
6
- *                             / __| | | | |_) | |
7
- *                            | (__| |_| |  _ <| |___
8
- *                             \___|\___/|_| \_\_____|
9
- *
10
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
11
- *
12
- * This software is licensed as described in the file COPYING, which
13
- * you should have received as part of this distribution. The terms
14
- * are also available at https://curl.haxx.se/docs/copyright.html.
15
- *
16
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
17
- * copies of the Software, and permit persons to whom the Software is
18
- * furnished to do so, under the terms of the COPYING file.
19
- *
20
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
21
- * KIND, either express or implied.
22
- *
23
- ***************************************************************************/
24
-
25
-/* ================================================================ */
26
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
27
-/* ================================================================ */
28
-
29
-/*
30
- * NOTE 1:
31
- * -------
32
- *
33
- * Nothing in this file is intended to be modified or adjusted by the
34
- * curl library user nor by the curl library builder.
35
- *
36
- * If you think that something actually needs to be changed, adjusted
37
- * or fixed in this file, then, report it on the libcurl development
38
- * mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/
39
- *
40
- * This header file shall only export symbols which are 'curl' or 'CURL'
41
- * prefixed, otherwise public name space would be polluted.
42
- *
43
- * NOTE 2:
44
- * -------
45
- *
46
- * Right now you might be staring at file include/curl/curlbuild.h.in or
47
- * at file include/curl/curlbuild.h, this is due to the following reason:
48
- *
49
- * On systems capable of running the configure script, the configure process
50
- * will overwrite the distributed include/curl/curlbuild.h file with one that
51
- * is suitable and specific to the library being configured and built, which
52
- * is generated from the include/curl/curlbuild.h.in template file.
53
- *
54
- */
55
-
56
-/* ================================================================ */
57
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
58
-/* ================================================================ */
59
-
60
-#ifdef CURL_SIZEOF_LONG
61
-#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
62
-   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
63
-#endif
64
-
65
-#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
66
-#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
67
-   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
68
-#endif
69
-
70
-#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
71
-#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
72
-   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
73
-#endif
74
-
75
-#ifdef CURL_TYPEOF_CURL_OFF_T
76
-#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
77
-   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
78
-#endif
79
-
80
-#ifdef CURL_FORMAT_CURL_OFF_T
81
-#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
82
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
83
-#endif
84
-
85
-#ifdef CURL_FORMAT_CURL_OFF_TU
86
-#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
87
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
88
-#endif
89
-
90
-#ifdef CURL_FORMAT_OFF_T
91
-#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
92
-   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
93
-#endif
94
-
95
-#ifdef CURL_SIZEOF_CURL_OFF_T
96
-#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
97
-   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
98
-#endif
99
-
100
-#ifdef CURL_SUFFIX_CURL_OFF_T
101
-#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
102
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
103
-#endif
104
-
105
-#ifdef CURL_SUFFIX_CURL_OFF_TU
106
-#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
107
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
108
-#endif
109
-
110
-/* ================================================================ */
111
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
112
-/* ================================================================ */
113
-
114
-/* Configure process defines this to 1 when it finds out that system  */
115
-/* header file ws2tcpip.h must be included by the external interface. */
116
-#cmakedefine CURL_PULL_WS2TCPIP_H
117
-#ifdef CURL_PULL_WS2TCPIP_H
118
-#  ifndef WIN32_LEAN_AND_MEAN
119
-#    define WIN32_LEAN_AND_MEAN
120
-#  endif
121
-#  include <windows.h>
122
-#  include <winsock2.h>
123
-#  include <ws2tcpip.h>
124
-#endif
125
-
126
-/* Configure process defines this to 1 when it finds out that system   */
127
-/* header file sys/types.h must be included by the external interface. */
128
-#cmakedefine CURL_PULL_SYS_TYPES_H
129
-#ifdef CURL_PULL_SYS_TYPES_H
130
-#  include <sys/types.h>
131
-#endif
132
-
133
-/* Configure process defines this to 1 when it finds out that system */
134
-/* header file stdint.h must be included by the external interface.  */
135
-#cmakedefine CURL_PULL_STDINT_H
136
-#ifdef CURL_PULL_STDINT_H
137
-#  include <stdint.h>
138
-#endif
139
-
140
-/* Configure process defines this to 1 when it finds out that system  */
141
-/* header file inttypes.h must be included by the external interface. */
142
-#cmakedefine CURL_PULL_INTTYPES_H
143
-#ifdef CURL_PULL_INTTYPES_H
144
-#  include <inttypes.h>
145
-#endif
146
-
147
-/* Configure process defines this to 1 when it finds out that system    */
148
-/* header file sys/socket.h must be included by the external interface. */
149
-#cmakedefine CURL_PULL_SYS_SOCKET_H
150
-#ifdef CURL_PULL_SYS_SOCKET_H
151
-#  include <sys/socket.h>
152
-#endif
153
-
154
-/* Configure process defines this to 1 when it finds out that system  */
155
-/* header file sys/poll.h must be included by the external interface. */
156
-#cmakedefine CURL_PULL_SYS_POLL_H
157
-#ifdef CURL_PULL_SYS_POLL_H
158
-#  include <sys/poll.h>
159
-#endif
160
-
161
-/* The size of `long', as computed by sizeof. */
162
-#define CURL_SIZEOF_LONG ${CURL_SIZEOF_LONG}
163
-
164
-/* Integral data type used for curl_socklen_t. */
165
-#define CURL_TYPEOF_CURL_SOCKLEN_T ${CURL_TYPEOF_CURL_SOCKLEN_T}
166
-
167
-/* The size of `curl_socklen_t', as computed by sizeof. */
168
-#define CURL_SIZEOF_CURL_SOCKLEN_T ${CURL_SIZEOF_CURL_SOCKLEN_T}
169
-
170
-/* Data type definition of curl_socklen_t. */
171
-typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
172
-
173
-/* Signed integral data type used for curl_off_t. */
174
-#define CURL_TYPEOF_CURL_OFF_T ${CURL_TYPEOF_CURL_OFF_T}
175
-
176
-/* Data type definition of curl_off_t. */
177
-typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
178
-
179
-/* curl_off_t formatting string directive without "%" conversion specifier. */
180
-#define CURL_FORMAT_CURL_OFF_T "${CURL_FORMAT_CURL_OFF_T}"
181
-
182
-/* unsigned curl_off_t formatting string without "%" conversion specifier. */
183
-#define CURL_FORMAT_CURL_OFF_TU "${CURL_FORMAT_CURL_OFF_TU}"
184
-
185
-/* curl_off_t formatting string directive with "%" conversion specifier. */
186
-#define CURL_FORMAT_OFF_T "${CURL_FORMAT_OFF_T}"
187
-
188
-/* The size of `curl_off_t', as computed by sizeof. */
189
-#define CURL_SIZEOF_CURL_OFF_T ${CURL_SIZEOF_CURL_OFF_T}
190
-
191
-/* curl_off_t constant suffix. */
192
-#define CURL_SUFFIX_CURL_OFF_T ${CURL_SUFFIX_CURL_OFF_T}
193
-
194
-/* unsigned curl_off_t constant suffix. */
195
-#define CURL_SUFFIX_CURL_OFF_TU ${CURL_SUFFIX_CURL_OFF_TU}
196
-
197
-#endif /* __CURL_CURLBUILD_H */

+ 0
- 586
include/curl/curlbuild.h.dist View File

@@ -1,586 +0,0 @@
1
-#ifndef __CURL_CURLBUILD_H
2
-#define __CURL_CURLBUILD_H
3
-/***************************************************************************
4
- *                                  _   _ ____  _
5
- *  Project                     ___| | | |  _ \| |
6
- *                             / __| | | | |_) | |
7
- *                            | (__| |_| |  _ <| |___
8
- *                             \___|\___/|_| \_\_____|
9
- *
10
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
11
- *
12
- * This software is licensed as described in the file COPYING, which
13
- * you should have received as part of this distribution. The terms
14
- * are also available at https://curl.haxx.se/docs/copyright.html.
15
- *
16
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
17
- * copies of the Software, and permit persons to whom the Software is
18
- * furnished to do so, under the terms of the COPYING file.
19
- *
20
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
21
- * KIND, either express or implied.
22
- *
23
- ***************************************************************************/
24
-
25
-/* ================================================================ */
26
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
27
-/* ================================================================ */
28
-
29
-/*
30
- * NOTE 1:
31
- * -------
32
- *
33
- * See file include/curl/curlbuild.h.in, run configure, and forget
34
- * that this file exists it is only used for non-configure systems.
35
- * But you can keep reading if you want ;-)
36
- *
37
- */
38
-
39
-/* ================================================================ */
40
-/*                 NOTES FOR NON-CONFIGURE SYSTEMS                  */
41
-/* ================================================================ */
42
-
43
-/*
44
- * NOTE 1:
45
- * -------
46
- *
47
- * Nothing in this file is intended to be modified or adjusted by the
48
- * curl library user nor by the curl library builder.
49
- *
50
- * If you think that something actually needs to be changed, adjusted
51
- * or fixed in this file, then, report it on the libcurl development
52
- * mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/
53
- *
54
- * Try to keep one section per platform, compiler and architecture,
55
- * otherwise, if an existing section is reused for a different one and
56
- * later on the original is adjusted, probably the piggybacking one can
57
- * be adversely changed.
58
- *
59
- * In order to differentiate between platforms/compilers/architectures
60
- * use only compiler built in predefined preprocessor symbols.
61
- *
62
- * This header file shall only export symbols which are 'curl' or 'CURL'
63
- * prefixed, otherwise public name space would be polluted.
64
- *
65
- * NOTE 2:
66
- * -------
67
- *
68
- * For any given platform/compiler curl_off_t must be typedef'ed to a
69
- * 64-bit wide signed integral data type. The width of this data type
70
- * must remain constant and independent of any possible large file
71
- * support settings.
72
- *
73
- * As an exception to the above, curl_off_t shall be typedef'ed to a
74
- * 32-bit wide signed integral data type if there is no 64-bit type.
75
- *
76
- * As a general rule, curl_off_t shall not be mapped to off_t. This
77
- * rule shall only be violated if off_t is the only 64-bit data type
78
- * available and the size of off_t is independent of large file support
79
- * settings. Keep your build on the safe side avoiding an off_t gating.
80
- * If you have a 64-bit off_t then take for sure that another 64-bit
81
- * data type exists, dig deeper and you will find it.
82
- *
83
- * NOTE 3:
84
- * -------
85
- *
86
- * Right now you might be staring at file include/curl/curlbuild.h.dist or
87
- * at file include/curl/curlbuild.h, this is due to the following reason:
88
- * file include/curl/curlbuild.h.dist is renamed to include/curl/curlbuild.h
89
- * when the libcurl source code distribution archive file is created.
90
- *
91
- * File include/curl/curlbuild.h.dist is not included in the distribution
92
- * archive. File include/curl/curlbuild.h is not present in the git tree.
93
- *
94
- * The distributed include/curl/curlbuild.h file is only intended to be used
95
- * on systems which can not run the also distributed configure script.
96
- *
97
- * On systems capable of running the configure script, the configure process
98
- * will overwrite the distributed include/curl/curlbuild.h file with one that
99
- * is suitable and specific to the library being configured and built, which
100
- * is generated from the include/curl/curlbuild.h.in template file.
101
- *
102
- * If you check out from git on a non-configure platform, you must run the
103
- * appropriate buildconf* script to set up curlbuild.h and other local files.
104
- *
105
- */
106
-
107
-/* ================================================================ */
108
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
109
-/* ================================================================ */
110
-
111
-#ifdef CURL_SIZEOF_LONG
112
-#  error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
113
-   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
114
-#endif
115
-
116
-#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
117
-#  error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
118
-   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
119
-#endif
120
-
121
-#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
122
-#  error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
123
-   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
124
-#endif
125
-
126
-#ifdef CURL_TYPEOF_CURL_OFF_T
127
-#  error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
128
-   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
129
-#endif
130
-
131
-#ifdef CURL_FORMAT_CURL_OFF_T
132
-#  error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
133
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
134
-#endif
135
-
136
-#ifdef CURL_FORMAT_CURL_OFF_TU
137
-#  error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
138
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
139
-#endif
140
-
141
-#ifdef CURL_FORMAT_OFF_T
142
-#  error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
143
-   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
144
-#endif
145
-
146
-#ifdef CURL_SIZEOF_CURL_OFF_T
147
-#  error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
148
-   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
149
-#endif
150
-
151
-#ifdef CURL_SUFFIX_CURL_OFF_T
152
-#  error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
153
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
154
-#endif
155
-
156
-#ifdef CURL_SUFFIX_CURL_OFF_TU
157
-#  error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
158
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
159
-#endif
160
-
161
-/* ================================================================ */
162
-/*    EXTERNAL INTERFACE SETTINGS FOR NON-CONFIGURE SYSTEMS ONLY    */
163
-/* ================================================================ */
164
-
165
-#if defined(__DJGPP__) || defined(__GO32__)
166
-#  if defined(__DJGPP__) && (__DJGPP__ > 1)
167
-#    define CURL_SIZEOF_LONG           4
168
-#    define CURL_TYPEOF_CURL_OFF_T     long long
169
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
170
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
171
-#    define CURL_FORMAT_OFF_T          "%lld"
172
-#    define CURL_SIZEOF_CURL_OFF_T     8
173
-#    define CURL_SUFFIX_CURL_OFF_T     LL
174
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
175
-#  else
176
-#    define CURL_SIZEOF_LONG           4
177
-#    define CURL_TYPEOF_CURL_OFF_T     long
178
-#    define CURL_FORMAT_CURL_OFF_T     "ld"
179
-#    define CURL_FORMAT_CURL_OFF_TU    "lu"
180
-#    define CURL_FORMAT_OFF_T          "%ld"
181
-#    define CURL_SIZEOF_CURL_OFF_T     4
182
-#    define CURL_SUFFIX_CURL_OFF_T     L
183
-#    define CURL_SUFFIX_CURL_OFF_TU    UL
184
-#  endif
185
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
186
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
187
-
188
-#elif defined(__SALFORDC__)
189
-#  define CURL_SIZEOF_LONG           4
190
-#  define CURL_TYPEOF_CURL_OFF_T     long
191
-#  define CURL_FORMAT_CURL_OFF_T     "ld"
192
-#  define CURL_FORMAT_CURL_OFF_TU    "lu"
193
-#  define CURL_FORMAT_OFF_T          "%ld"
194
-#  define CURL_SIZEOF_CURL_OFF_T     4
195
-#  define CURL_SUFFIX_CURL_OFF_T     L
196
-#  define CURL_SUFFIX_CURL_OFF_TU    UL
197
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
198
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
199
-
200
-#elif defined(__BORLANDC__)
201
-#  if (__BORLANDC__ < 0x520)
202
-#    define CURL_SIZEOF_LONG           4
203
-#    define CURL_TYPEOF_CURL_OFF_T     long
204
-#    define CURL_FORMAT_CURL_OFF_T     "ld"
205
-#    define CURL_FORMAT_CURL_OFF_TU    "lu"
206
-#    define CURL_FORMAT_OFF_T          "%ld"
207
-#    define CURL_SIZEOF_CURL_OFF_T     4
208
-#    define CURL_SUFFIX_CURL_OFF_T     L
209
-#    define CURL_SUFFIX_CURL_OFF_TU    UL
210
-#  else
211
-#    define CURL_SIZEOF_LONG           4
212
-#    define CURL_TYPEOF_CURL_OFF_T     __int64
213
-#    define CURL_FORMAT_CURL_OFF_T     "I64d"
214
-#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
215
-#    define CURL_FORMAT_OFF_T          "%I64d"
216
-#    define CURL_SIZEOF_CURL_OFF_T     8
217
-#    define CURL_SUFFIX_CURL_OFF_T     i64
218
-#    define CURL_SUFFIX_CURL_OFF_TU    ui64
219
-#  endif
220
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
221
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
222
-
223
-#elif defined(__TURBOC__)
224
-#  define CURL_SIZEOF_LONG           4
225
-#  define CURL_TYPEOF_CURL_OFF_T     long
226
-#  define CURL_FORMAT_CURL_OFF_T     "ld"
227
-#  define CURL_FORMAT_CURL_OFF_TU    "lu"
228
-#  define CURL_FORMAT_OFF_T          "%ld"
229
-#  define CURL_SIZEOF_CURL_OFF_T     4
230
-#  define CURL_SUFFIX_CURL_OFF_T     L
231
-#  define CURL_SUFFIX_CURL_OFF_TU    UL
232
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
233
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
234
-
235
-#elif defined(__WATCOMC__)
236
-#  if defined(__386__)
237
-#    define CURL_SIZEOF_LONG           4
238
-#    define CURL_TYPEOF_CURL_OFF_T     __int64
239
-#    define CURL_FORMAT_CURL_OFF_T     "I64d"
240
-#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
241
-#    define CURL_FORMAT_OFF_T          "%I64d"
242
-#    define CURL_SIZEOF_CURL_OFF_T     8
243
-#    define CURL_SUFFIX_CURL_OFF_T     i64
244
-#    define CURL_SUFFIX_CURL_OFF_TU    ui64
245
-#  else
246
-#    define CURL_SIZEOF_LONG           4
247
-#    define CURL_TYPEOF_CURL_OFF_T     long
248
-#    define CURL_FORMAT_CURL_OFF_T     "ld"
249
-#    define CURL_FORMAT_CURL_OFF_TU    "lu"
250
-#    define CURL_FORMAT_OFF_T          "%ld"
251
-#    define CURL_SIZEOF_CURL_OFF_T     4
252
-#    define CURL_SUFFIX_CURL_OFF_T     L
253
-#    define CURL_SUFFIX_CURL_OFF_TU    UL
254
-#  endif
255
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
256
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
257
-
258
-#elif defined(__POCC__)
259
-#  if (__POCC__ < 280)
260
-#    define CURL_SIZEOF_LONG           4
261
-#    define CURL_TYPEOF_CURL_OFF_T     long
262
-#    define CURL_FORMAT_CURL_OFF_T     "ld"
263
-#    define CURL_FORMAT_CURL_OFF_TU    "lu"
264
-#    define CURL_FORMAT_OFF_T          "%ld"
265
-#    define CURL_SIZEOF_CURL_OFF_T     4
266
-#    define CURL_SUFFIX_CURL_OFF_T     L
267
-#    define CURL_SUFFIX_CURL_OFF_TU    UL
268
-#  elif defined(_MSC_VER)
269
-#    define CURL_SIZEOF_LONG           4
270
-#    define CURL_TYPEOF_CURL_OFF_T     __int64
271
-#    define CURL_FORMAT_CURL_OFF_T     "I64d"
272
-#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
273
-#    define CURL_FORMAT_OFF_T          "%I64d"
274
-#    define CURL_SIZEOF_CURL_OFF_T     8
275
-#    define CURL_SUFFIX_CURL_OFF_T     i64
276
-#    define CURL_SUFFIX_CURL_OFF_TU    ui64
277
-#  else
278
-#    define CURL_SIZEOF_LONG           4
279
-#    define CURL_TYPEOF_CURL_OFF_T     long long
280
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
281
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
282
-#    define CURL_FORMAT_OFF_T          "%lld"
283
-#    define CURL_SIZEOF_CURL_OFF_T     8
284
-#    define CURL_SUFFIX_CURL_OFF_T     LL
285
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
286
-#  endif
287
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
288
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
289
-
290
-#elif defined(__LCC__)
291
-#  define CURL_SIZEOF_LONG           4
292
-#  define CURL_TYPEOF_CURL_OFF_T     long
293
-#  define CURL_FORMAT_CURL_OFF_T     "ld"
294
-#  define CURL_FORMAT_CURL_OFF_TU    "lu"
295
-#  define CURL_FORMAT_OFF_T          "%ld"
296
-#  define CURL_SIZEOF_CURL_OFF_T     4
297
-#  define CURL_SUFFIX_CURL_OFF_T     L
298
-#  define CURL_SUFFIX_CURL_OFF_TU    UL
299
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
300
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
301
-
302
-#elif defined(__SYMBIAN32__)
303
-#  if defined(__EABI__)  /* Treat all ARM compilers equally */
304
-#    define CURL_SIZEOF_LONG           4
305
-#    define CURL_TYPEOF_CURL_OFF_T     long long
306
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
307
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
308
-#    define CURL_FORMAT_OFF_T          "%lld"
309
-#    define CURL_SIZEOF_CURL_OFF_T     8
310
-#    define CURL_SUFFIX_CURL_OFF_T     LL
311
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
312
-#  elif defined(__CW32__)
313
-#    pragma longlong on
314
-#    define CURL_SIZEOF_LONG           4
315
-#    define CURL_TYPEOF_CURL_OFF_T     long long
316
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
317
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
318
-#    define CURL_FORMAT_OFF_T          "%lld"
319
-#    define CURL_SIZEOF_CURL_OFF_T     8
320
-#    define CURL_SUFFIX_CURL_OFF_T     LL
321
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
322
-#  elif defined(__VC32__)
323
-#    define CURL_SIZEOF_LONG           4
324
-#    define CURL_TYPEOF_CURL_OFF_T     __int64
325
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
326
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
327
-#    define CURL_FORMAT_OFF_T          "%lld"
328
-#    define CURL_SIZEOF_CURL_OFF_T     8
329
-#    define CURL_SUFFIX_CURL_OFF_T     LL
330
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
331
-#  endif
332
-#  define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
333
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
334
-
335
-#elif defined(__MWERKS__)
336
-#  define CURL_SIZEOF_LONG           4
337
-#  define CURL_TYPEOF_CURL_OFF_T     long long
338
-#  define CURL_FORMAT_CURL_OFF_T     "lld"
339
-#  define CURL_FORMAT_CURL_OFF_TU    "llu"
340
-#  define CURL_FORMAT_OFF_T          "%lld"
341
-#  define CURL_SIZEOF_CURL_OFF_T     8
342
-#  define CURL_SUFFIX_CURL_OFF_T     LL
343
-#  define CURL_SUFFIX_CURL_OFF_TU    ULL
344
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
345
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
346
-
347
-#elif defined(_WIN32_WCE)
348
-#  define CURL_SIZEOF_LONG           4
349
-#  define CURL_TYPEOF_CURL_OFF_T     __int64
350
-#  define CURL_FORMAT_CURL_OFF_T     "I64d"
351
-#  define CURL_FORMAT_CURL_OFF_TU    "I64u"
352
-#  define CURL_FORMAT_OFF_T          "%I64d"
353
-#  define CURL_SIZEOF_CURL_OFF_T     8
354
-#  define CURL_SUFFIX_CURL_OFF_T     i64
355
-#  define CURL_SUFFIX_CURL_OFF_TU    ui64
356
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
357
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
358
-
359
-#elif defined(__MINGW32__)
360
-#  define CURL_SIZEOF_LONG           4
361
-#  define CURL_TYPEOF_CURL_OFF_T     long long
362
-#  define CURL_FORMAT_CURL_OFF_T     "I64d"
363
-#  define CURL_FORMAT_CURL_OFF_TU    "I64u"
364
-#  define CURL_FORMAT_OFF_T          "%I64d"
365
-#  define CURL_SIZEOF_CURL_OFF_T     8
366
-#  define CURL_SUFFIX_CURL_OFF_T     LL
367
-#  define CURL_SUFFIX_CURL_OFF_TU    ULL
368
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
369
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
370
-
371
-#elif defined(__VMS)
372
-#  if defined(__VAX)
373
-#    define CURL_SIZEOF_LONG           4
374
-#    define CURL_TYPEOF_CURL_OFF_T     long
375
-#    define CURL_FORMAT_CURL_OFF_T     "ld"
376
-#    define CURL_FORMAT_CURL_OFF_TU    "lu"
377
-#    define CURL_FORMAT_OFF_T          "%ld"
378
-#    define CURL_SIZEOF_CURL_OFF_T     4
379
-#    define CURL_SUFFIX_CURL_OFF_T     L
380
-#    define CURL_SUFFIX_CURL_OFF_TU    UL
381
-#  else
382
-#    define CURL_SIZEOF_LONG           4
383
-#    define CURL_TYPEOF_CURL_OFF_T     long long
384
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
385
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
386
-#    define CURL_FORMAT_OFF_T          "%lld"
387
-#    define CURL_SIZEOF_CURL_OFF_T     8
388
-#    define CURL_SUFFIX_CURL_OFF_T     LL
389
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
390
-#  endif
391
-#  define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
392
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
393
-
394
-#elif defined(__OS400__)
395
-#  if defined(__ILEC400__)
396
-#    define CURL_SIZEOF_LONG           4
397
-#    define CURL_TYPEOF_CURL_OFF_T     long long
398
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
399
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
400
-#    define CURL_FORMAT_OFF_T          "%lld"
401
-#    define CURL_SIZEOF_CURL_OFF_T     8
402
-#    define CURL_SUFFIX_CURL_OFF_T     LL
403
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
404
-#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
405
-#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
406
-#    define CURL_PULL_SYS_TYPES_H      1
407
-#    define CURL_PULL_SYS_SOCKET_H     1
408
-#  endif
409
-
410
-#elif defined(__MVS__)
411
-#  if defined(__IBMC__) || defined(__IBMCPP__)
412
-#    if defined(_ILP32)
413
-#      define CURL_SIZEOF_LONG           4
414
-#    elif defined(_LP64)
415
-#      define CURL_SIZEOF_LONG           8
416
-#    endif
417
-#    if defined(_LONG_LONG)
418
-#      define CURL_TYPEOF_CURL_OFF_T     long long
419
-#      define CURL_FORMAT_CURL_OFF_T     "lld"
420
-#      define CURL_FORMAT_CURL_OFF_TU    "llu"
421
-#      define CURL_FORMAT_OFF_T          "%lld"
422
-#      define CURL_SIZEOF_CURL_OFF_T     8
423
-#      define CURL_SUFFIX_CURL_OFF_T     LL
424
-#      define CURL_SUFFIX_CURL_OFF_TU    ULL
425
-#    elif defined(_LP64)
426
-#      define CURL_TYPEOF_CURL_OFF_T     long
427
-#      define CURL_FORMAT_CURL_OFF_T     "ld"
428
-#      define CURL_FORMAT_CURL_OFF_TU    "lu"
429
-#      define CURL_FORMAT_OFF_T          "%ld"
430
-#      define CURL_SIZEOF_CURL_OFF_T     8
431
-#      define CURL_SUFFIX_CURL_OFF_T     L
432
-#      define CURL_SUFFIX_CURL_OFF_TU    UL
433
-#    else
434
-#      define CURL_TYPEOF_CURL_OFF_T     long
435
-#      define CURL_FORMAT_CURL_OFF_T     "ld"
436
-#      define CURL_FORMAT_CURL_OFF_TU    "lu"
437
-#      define CURL_FORMAT_OFF_T          "%ld"
438
-#      define CURL_SIZEOF_CURL_OFF_T     4
439
-#      define CURL_SUFFIX_CURL_OFF_T     L
440
-#      define CURL_SUFFIX_CURL_OFF_TU    UL
441
-#    endif
442
-#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
443
-#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
444
-#    define CURL_PULL_SYS_TYPES_H      1
445
-#    define CURL_PULL_SYS_SOCKET_H     1
446
-#  endif
447
-
448
-#elif defined(__370__)
449
-#  if defined(__IBMC__) || defined(__IBMCPP__)
450
-#    if defined(_ILP32)
451
-#      define CURL_SIZEOF_LONG           4
452
-#    elif defined(_LP64)
453
-#      define CURL_SIZEOF_LONG           8
454
-#    endif
455
-#    if defined(_LONG_LONG)
456
-#      define CURL_TYPEOF_CURL_OFF_T     long long
457
-#      define CURL_FORMAT_CURL_OFF_T     "lld"
458
-#      define CURL_FORMAT_CURL_OFF_TU    "llu"
459
-#      define CURL_FORMAT_OFF_T          "%lld"
460
-#      define CURL_SIZEOF_CURL_OFF_T     8
461
-#      define CURL_SUFFIX_CURL_OFF_T     LL
462
-#      define CURL_SUFFIX_CURL_OFF_TU    ULL
463
-#    elif defined(_LP64)
464
-#      define CURL_TYPEOF_CURL_OFF_T     long
465
-#      define CURL_FORMAT_CURL_OFF_T     "ld"
466
-#      define CURL_FORMAT_CURL_OFF_TU    "lu"
467
-#      define CURL_FORMAT_OFF_T          "%ld"
468
-#      define CURL_SIZEOF_CURL_OFF_T     8
469
-#      define CURL_SUFFIX_CURL_OFF_T     L
470
-#      define CURL_SUFFIX_CURL_OFF_TU    UL
471
-#    else
472
-#      define CURL_TYPEOF_CURL_OFF_T     long
473
-#      define CURL_FORMAT_CURL_OFF_T     "ld"
474
-#      define CURL_FORMAT_CURL_OFF_TU    "lu"
475
-#      define CURL_FORMAT_OFF_T          "%ld"
476
-#      define CURL_SIZEOF_CURL_OFF_T     4
477
-#      define CURL_SUFFIX_CURL_OFF_T     L
478
-#      define CURL_SUFFIX_CURL_OFF_TU    UL
479
-#    endif
480
-#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
481
-#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
482
-#    define CURL_PULL_SYS_TYPES_H      1
483
-#    define CURL_PULL_SYS_SOCKET_H     1
484
-#  endif
485
-
486
-#elif defined(TPF)
487
-#  define CURL_SIZEOF_LONG           8
488
-#  define CURL_TYPEOF_CURL_OFF_T     long
489
-#  define CURL_FORMAT_CURL_OFF_T     "ld"
490
-#  define CURL_FORMAT_CURL_OFF_TU    "lu"
491
-#  define CURL_FORMAT_OFF_T          "%ld"
492
-#  define CURL_SIZEOF_CURL_OFF_T     8
493
-#  define CURL_SUFFIX_CURL_OFF_T     L
494
-#  define CURL_SUFFIX_CURL_OFF_TU    UL
495
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
496
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
497
-
498
-/* ===================================== */
499
-/*    KEEP MSVC THE PENULTIMATE ENTRY    */
500
-/* ===================================== */
501
-
502
-#elif defined(_MSC_VER)
503
-#  if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
504
-#    define CURL_SIZEOF_LONG           4
505
-#    define CURL_TYPEOF_CURL_OFF_T     __int64
506
-#    define CURL_FORMAT_CURL_OFF_T     "I64d"
507
-#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
508
-#    define CURL_FORMAT_OFF_T          "%I64d"
509
-#    define CURL_SIZEOF_CURL_OFF_T     8
510
-#    define CURL_SUFFIX_CURL_OFF_T     i64
511
-#    define CURL_SUFFIX_CURL_OFF_TU    ui64
512
-#  else
513
-#    define CURL_SIZEOF_LONG           4
514
-#    define CURL_TYPEOF_CURL_OFF_T     long
515
-#    define CURL_FORMAT_CURL_OFF_T     "ld"
516
-#    define CURL_FORMAT_CURL_OFF_TU    "lu"
517
-#    define CURL_FORMAT_OFF_T          "%ld"
518
-#    define CURL_SIZEOF_CURL_OFF_T     4
519
-#    define CURL_SUFFIX_CURL_OFF_T     L
520
-#    define CURL_SUFFIX_CURL_OFF_TU    UL
521
-#  endif
522
-#  define CURL_TYPEOF_CURL_SOCKLEN_T int
523
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
524
-
525
-/* ===================================== */
526
-/*    KEEP GENERIC GCC THE LAST ENTRY    */
527
-/* ===================================== */
528
-
529
-#elif defined(__GNUC__)
530
-#  if !defined(__LP64__) && (defined(__ILP32__) || \
531
-      defined(__i386__) || defined(__ppc__) || defined(__arm__) || \
532
-      defined(__sparc__) || defined(__mips__) || defined(__sh__))
533
-#    define CURL_SIZEOF_LONG           4
534
-#    define CURL_TYPEOF_CURL_OFF_T     long long
535
-#    define CURL_FORMAT_CURL_OFF_T     "lld"
536
-#    define CURL_FORMAT_CURL_OFF_TU    "llu"
537
-#    define CURL_FORMAT_OFF_T          "%lld"
538
-#    define CURL_SIZEOF_CURL_OFF_T     8
539
-#    define CURL_SUFFIX_CURL_OFF_T     LL
540
-#    define CURL_SUFFIX_CURL_OFF_TU    ULL
541
-#  elif defined(__LP64__) || \
542
-        defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__)
543
-#    define CURL_SIZEOF_LONG           8
544
-#    define CURL_TYPEOF_CURL_OFF_T     long
545
-#    define CURL_FORMAT_CURL_OFF_T     "ld"
546
-#    define CURL_FORMAT_CURL_OFF_TU    "lu"
547
-#    define CURL_FORMAT_OFF_T          "%ld"
548
-#    define CURL_SIZEOF_CURL_OFF_T     8
549
-#    define CURL_SUFFIX_CURL_OFF_T     L
550
-#    define CURL_SUFFIX_CURL_OFF_TU    UL
551
-#  endif
552
-#  define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
553
-#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
554
-#  define CURL_PULL_SYS_TYPES_H      1
555
-#  define CURL_PULL_SYS_SOCKET_H     1
556
-
557
-#else
558
-#  error "Unknown non-configure build target!"
559
-   Error Compilation_aborted_Unknown_non_configure_build_target
560
-#endif
561
-
562
-/* CURL_PULL_SYS_TYPES_H is defined above when inclusion of header file  */
563
-/* sys/types.h is required here to properly make type definitions below. */
564
-#ifdef CURL_PULL_SYS_TYPES_H
565
-#  include <sys/types.h>
566
-#endif
567
-
568
-/* CURL_PULL_SYS_SOCKET_H is defined above when inclusion of header file  */
569
-/* sys/socket.h is required here to properly make type definitions below. */
570
-#ifdef CURL_PULL_SYS_SOCKET_H
571
-#  include <sys/socket.h>
572
-#endif
573
-
574
-/* Data type definition of curl_socklen_t. */
575
-
576
-#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
577
-  typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
578
-#endif
579
-
580
-/* Data type definition of curl_off_t. */
581
-
582
-#ifdef CURL_TYPEOF_CURL_OFF_T
583
-  typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
584
-#endif
585
-
586
-#endif /* __CURL_CURLBUILD_H */

+ 0
- 197
include/curl/curlbuild.h.in View File

@@ -1,197 +0,0 @@
1
-#ifndef __CURL_CURLBUILD_H
2
-#define __CURL_CURLBUILD_H
3
-/***************************************************************************
4
- *                                  _   _ ____  _
5
- *  Project                     ___| | | |  _ \| |
6
- *                             / __| | | | |_) | |
7
- *                            | (__| |_| |  _ <| |___
8
- *                             \___|\___/|_| \_\_____|
9
- *
10
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
11
- *
12
- * This software is licensed as described in the file COPYING, which
13
- * you should have received as part of this distribution. The terms
14
- * are also available at https://curl.haxx.se/docs/copyright.html.
15
- *
16
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
17
- * copies of the Software, and permit persons to whom the Software is
18
- * furnished to do so, under the terms of the COPYING file.
19
- *
20
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
21
- * KIND, either express or implied.
22
- *
23
- ***************************************************************************/
24
-
25
-/* ================================================================ */
26
-/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
27
-/* ================================================================ */
28
-
29
-/*
30
- * NOTE 1:
31
- * -------
32
- *
33
- * Nothing in this file is intended to be modified or adjusted by the
34
- * curl library user nor by the curl library builder.
35
- *
36
- * If you think that something actually needs to be changed, adjusted
37
- * or fixed in this file, then, report it on the libcurl development
38
- * mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/
39
- *
40
- * This header file shall only export symbols which are 'curl' or 'CURL'
41
- * prefixed, otherwise public name space would be polluted.
42
- *
43
- * NOTE 2:
44
- * -------
45
- *
46
- * Right now you might be staring at file include/curl/curlbuild.h.in or
47
- * at file include/curl/curlbuild.h, this is due to the following reason:
48
- *
49
- * On systems capable of running the configure script, the configure process
50
- * will overwrite the distributed include/curl/curlbuild.h file with one that
51
- * is suitable and specific to the library being configured and built, which
52
- * is generated from the include/curl/curlbuild.h.in template file.
53
- *
54
- */
55
-
56
-/* ================================================================ */
57
-/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
58
-/* ================================================================ */
59
-
60
-#ifdef CURL_SIZEOF_LONG
61
-#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h"
62
-   Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined
63
-#endif
64
-
65
-#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
66
-#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
67
-   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined
68
-#endif
69
-
70
-#ifdef CURL_SIZEOF_CURL_SOCKLEN_T
71
-#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h"
72
-   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined
73
-#endif
74
-
75
-#ifdef CURL_TYPEOF_CURL_OFF_T
76
-#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
77
-   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined
78
-#endif
79
-
80
-#ifdef CURL_FORMAT_CURL_OFF_T
81
-#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h"
82
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined
83
-#endif
84
-
85
-#ifdef CURL_FORMAT_CURL_OFF_TU
86
-#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h"
87
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined
88
-#endif
89
-
90
-#ifdef CURL_FORMAT_OFF_T
91
-#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h"
92
-   Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined
93
-#endif
94
-
95
-#ifdef CURL_SIZEOF_CURL_OFF_T
96
-#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h"
97
-   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined
98
-#endif
99
-
100
-#ifdef CURL_SUFFIX_CURL_OFF_T
101
-#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h"
102
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined
103
-#endif
104
-
105
-#ifdef CURL_SUFFIX_CURL_OFF_TU
106
-#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h"
107
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined
108
-#endif
109
-
110
-/* ================================================================ */
111
-/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
112
-/* ================================================================ */
113
-
114
-/* Configure process defines this to 1 when it finds out that system  */
115
-/* header file ws2tcpip.h must be included by the external interface. */
116
-#undef CURL_PULL_WS2TCPIP_H
117
-#ifdef CURL_PULL_WS2TCPIP_H
118
-#  ifndef WIN32_LEAN_AND_MEAN
119
-#    define WIN32_LEAN_AND_MEAN
120
-#  endif
121
-#  include <windows.h>
122
-#  include <winsock2.h>
123
-#  include <ws2tcpip.h>
124
-#endif
125
-
126
-/* Configure process defines this to 1 when it finds out that system   */
127
-/* header file sys/types.h must be included by the external interface. */
128
-#undef CURL_PULL_SYS_TYPES_H
129
-#ifdef CURL_PULL_SYS_TYPES_H
130
-#  include <sys/types.h>
131
-#endif
132
-
133
-/* Configure process defines this to 1 when it finds out that system */
134
-/* header file stdint.h must be included by the external interface.  */
135
-#undef CURL_PULL_STDINT_H
136
-#ifdef CURL_PULL_STDINT_H
137
-#  include <stdint.h>
138
-#endif
139
-
140
-/* Configure process defines this to 1 when it finds out that system  */
141
-/* header file inttypes.h must be included by the external interface. */
142
-#undef CURL_PULL_INTTYPES_H
143
-#ifdef CURL_PULL_INTTYPES_H
144
-#  include <inttypes.h>
145
-#endif
146
-
147
-/* Configure process defines this to 1 when it finds out that system    */
148
-/* header file sys/socket.h must be included by the external interface. */
149
-#undef CURL_PULL_SYS_SOCKET_H
150
-#ifdef CURL_PULL_SYS_SOCKET_H
151
-#  include <sys/socket.h>
152
-#endif
153
-
154
-/* Configure process defines this to 1 when it finds out that system  */
155
-/* header file sys/poll.h must be included by the external interface. */
156
-#undef CURL_PULL_SYS_POLL_H
157
-#ifdef CURL_PULL_SYS_POLL_H
158
-#  include <sys/poll.h>
159
-#endif
160
-
161
-/* The size of `long', as computed by sizeof. */
162
-#undef CURL_SIZEOF_LONG
163
-
164
-/* Integral data type used for curl_socklen_t. */
165
-#undef CURL_TYPEOF_CURL_SOCKLEN_T
166
-
167
-/* The size of `curl_socklen_t', as computed by sizeof. */
168
-#undef CURL_SIZEOF_CURL_SOCKLEN_T
169
-
170
-/* Data type definition of curl_socklen_t. */
171
-typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
172
-
173
-/* Signed integral data type used for curl_off_t. */
174
-#undef CURL_TYPEOF_CURL_OFF_T
175
-
176
-/* Data type definition of curl_off_t. */
177
-typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
178
-
179
-/* curl_off_t formatting string directive without "%" conversion specifier. */
180
-#undef CURL_FORMAT_CURL_OFF_T
181
-
182
-/* unsigned curl_off_t formatting string without "%" conversion specifier. */
183
-#undef CURL_FORMAT_CURL_OFF_TU
184
-
185
-/* curl_off_t formatting string directive with "%" conversion specifier. */
186
-#undef CURL_FORMAT_OFF_T
187
-
188
-/* The size of `curl_off_t', as computed by sizeof. */
189
-#undef CURL_SIZEOF_CURL_OFF_T
190
-
191
-/* curl_off_t constant suffix. */
192
-#undef CURL_SUFFIX_CURL_OFF_T
193
-
194
-/* unsigned curl_off_t constant suffix. */
195
-#undef CURL_SUFFIX_CURL_OFF_TU
196
-
197
-#endif /* __CURL_CURLBUILD_H */

+ 0
- 239
include/curl/curlrules.h View File

@@ -1,239 +0,0 @@
1
-#ifndef __CURL_CURLRULES_H
2
-#define __CURL_CURLRULES_H
3
-/***************************************************************************
4
- *                                  _   _ ____  _
5
- *  Project                     ___| | | |  _ \| |
6
- *                             / __| | | | |_) | |
7
- *                            | (__| |_| |  _ <| |___
8
- *                             \___|\___/|_| \_\_____|
9
- *
10
- * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
11
- *
12
- * This software is licensed as described in the file COPYING, which
13
- * you should have received as part of this distribution. The terms
14
- * are also available at https://curl.haxx.se/docs/copyright.html.
15
- *
16
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
17
- * copies of the Software, and permit persons to whom the Software is
18
- * furnished to do so, under the terms of the COPYING file.
19
- *
20
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
21
- * KIND, either express or implied.
22
- *
23
- ***************************************************************************/
24
-
25
-/* ================================================================ */
26
-/*                    COMPILE TIME SANITY CHECKS                    */
27
-/* ================================================================ */
28
-
29
-/*
30
- * NOTE 1:
31
- * -------
32
- *
33
- * All checks done in this file are intentionally placed in a public
34
- * header file which is pulled by curl/curl.h when an application is
35
- * being built using an already built libcurl library. Additionally
36
- * this file is also included and used when building the library.
37
- *
38
- * If compilation fails on this file it is certainly sure that the
39
- * problem is elsewhere. It could be a problem in the curlbuild.h
40
- * header file, or simply that you are using different compilation
41
- * settings than those used to build the library.
42
- *
43
- * Nothing in this file is intended to be modified or adjusted by the
44
- * curl library user nor by the curl library builder.
45
- *
46
- * Do not deactivate any check, these are done to make sure that the
47
- * library is properly built and used.
48
- *
49
- * You can find further help on the libcurl development mailing list:
50
- * https://cool.haxx.se/mailman/listinfo/curl-library/
51
- *
52
- * NOTE 2
53
- * ------
54
- *
55
- * Some of the following compile time checks are based on the fact
56
- * that the dimension of a constant array can not be a negative one.
57
- * In this way if the compile time verification fails, the compilation
58
- * will fail issuing an error. The error description wording is compiler
59
- * dependent but it will be quite similar to one of the following:
60
- *
61
- *   "negative subscript or subscript is too large"
62
- *   "array must have at least one element"
63
- *   "-1 is an illegal array size"
64
- *   "size of array is negative"
65
- *
66
- * If you are building an application which tries to use an already
67
- * built libcurl library and you are getting this kind of errors on
68
- * this file, it is a clear indication that there is a mismatch between
69
- * how the library was built and how you are trying to use it for your
70
- * application. Your already compiled or binary library provider is the
71
- * only one who can give you the details you need to properly use it.
72
- */
73
-
74
-/*
75
- * Verify that some macros are actually defined.
76
- */
77
-
78
-#ifndef CURL_SIZEOF_LONG
79
-#  error "CURL_SIZEOF_LONG definition is missing!"
80
-   Error Compilation_aborted_CURL_SIZEOF_LONG_is_missing
81
-#endif
82
-
83
-#ifndef CURL_TYPEOF_CURL_SOCKLEN_T
84
-#  error "CURL_TYPEOF_CURL_SOCKLEN_T definition is missing!"
85
-   Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_is_missing
86
-#endif
87
-
88
-#ifndef CURL_SIZEOF_CURL_SOCKLEN_T
89
-#  error "CURL_SIZEOF_CURL_SOCKLEN_T definition is missing!"
90
-   Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_is_missing
91
-#endif
92
-
93
-#ifndef CURL_TYPEOF_CURL_OFF_T
94
-#  error "CURL_TYPEOF_CURL_OFF_T definition is missing!"
95
-   Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_is_missing
96
-#endif
97
-
98
-#ifndef CURL_FORMAT_CURL_OFF_T
99
-#  error "CURL_FORMAT_CURL_OFF_T definition is missing!"
100
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_is_missing
101
-#endif
102
-
103
-#ifndef CURL_FORMAT_CURL_OFF_TU
104
-#  error "CURL_FORMAT_CURL_OFF_TU definition is missing!"
105
-   Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_is_missing
106
-#endif
107
-
108
-#ifndef CURL_SIZEOF_CURL_OFF_T
109
-#  error "CURL_SIZEOF_CURL_OFF_T definition is missing!"
110
-   Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_is_missing
111
-#endif
112
-
113
-#ifndef CURL_SUFFIX_CURL_OFF_T
114
-#  error "CURL_SUFFIX_CURL_OFF_T definition is missing!"
115
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_is_missing
116
-#endif
117
-
118
-#ifndef CURL_SUFFIX_CURL_OFF_TU
119
-#  error "CURL_SUFFIX_CURL_OFF_TU definition is missing!"
120
-   Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_is_missing
121
-#endif
122
-
123
-/*
124
- * Macros private to this header file.
125
- */
126
-
127
-#define CurlchkszEQ(t, s) sizeof(t) == s ? 1 : -1
128
-
129
-#define CurlchkszGE(t1, t2) sizeof(t1) >= sizeof(t2) ? 1 : -1
130
-
131
-/*
132
- * Verify that the size previously defined and expected for long
133
- * is the same as the one reported by sizeof() at compile time.
134
- */
135
-
136
-typedef char
137
-  __curl_rule_01__
138
-    [CurlchkszEQ(long, CURL_SIZEOF_LONG)];
139
-
140
-/*
141
- * Verify that the size previously defined and expected for
142
- * curl_off_t is actually the the same as the one reported
143
- * by sizeof() at compile time.
144
- */
145
-
146
-typedef char
147
-  __curl_rule_02__
148
-    [CurlchkszEQ(curl_off_t, CURL_SIZEOF_CURL_OFF_T)];
149
-
150
-/*
151
- * Verify at compile time that the size of curl_off_t as reported
152
- * by sizeof() is greater or equal than the one reported for long
153
- * for the current compilation.
154
- */
155
-
156
-typedef char
157
-  __curl_rule_03__
158
-    [CurlchkszGE(curl_off_t, long)];
159
-
160
-/*
161
- * Verify that the size previously defined and expected for
162
- * curl_socklen_t is actually the the same as the one reported
163
- * by sizeof() at compile time.
164
- */
165
-
166
-typedef char
167
-  __curl_rule_04__
168
-    [CurlchkszEQ(curl_socklen_t, CURL_SIZEOF_CURL_SOCKLEN_T)];
169
-
170
-/*
171
- * Verify at compile time that the size of curl_socklen_t as reported
172
- * by sizeof() is greater or equal than the one reported for int for
173
- * the current compilation.
174
- */
175
-
176
-typedef char
177
-  __curl_rule_05__
178
-    [CurlchkszGE(curl_socklen_t, int)];
179
-
180
-/* ================================================================ */
181
-/*          EXTERNALLY AND INTERNALLY VISIBLE DEFINITIONS           */
182
-/* ================================================================ */
183
-
184
-/*
185
- * CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow
186
- * these to be visible and exported by the external libcurl interface API,
187
- * while also making them visible to the library internals, simply including
188
- * curl_setup.h, without actually needing to include curl.h internally.
189
- * If some day this section would grow big enough, all this should be moved
190
- * to its own header file.
191
- */
192
-
193
-/*
194
- * Figure out if we can use the ## preprocessor operator, which is supported
195
- * by ISO/ANSI C and C++. Some compilers support it without setting __STDC__
196
- * or  __cplusplus so we need to carefully check for them too.
197
- */
198
-
199
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
200
-  defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \
201
-  defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \
202
-  defined(__ILEC400__)
203
-  /* This compiler is believed to have an ISO compatible preprocessor */
204
-#define CURL_ISOCPP
205
-#else
206
-  /* This compiler is believed NOT to have an ISO compatible preprocessor */
207
-#undef CURL_ISOCPP
208
-#endif
209
-
210
-/*
211
- * Macros for minimum-width signed and unsigned curl_off_t integer constants.
212
- */
213
-
214
-#if defined(__BORLANDC__) && (__BORLANDC__ == 0x0551)
215
-#  define __CURL_OFF_T_C_HLPR2(x) x
216
-#  define __CURL_OFF_T_C_HLPR1(x) __CURL_OFF_T_C_HLPR2(x)
217
-#  define CURL_OFF_T_C(Val)  __CURL_OFF_T_C_HLPR1(Val) ## \
218
-                             __CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_T)
219
-#  define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val) ## \
220
-                             __CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_TU)
221
-#else
222
-#  ifdef CURL_ISOCPP
223
-#    define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val ## Suffix
224
-#  else
225
-#    define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val/**/Suffix
226
-#  endif
227
-#  define __CURL_OFF_T_C_HLPR1(Val,Suffix) __CURL_OFF_T_C_HLPR2(Val,Suffix)
228
-#  define CURL_OFF_T_C(Val)  __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_T)
229
-#  define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_TU)
230
-#endif
231
-
232
-/*
233
- * Get rid of macros private to this header file.
234
- */
235
-
236
-#undef CurlchkszEQ
237
-#undef CurlchkszGE
238
-
239
-#endif /* __CURL_CURLRULES_H */

+ 343
- 303
include/curl/system.h View File

@@ -23,14 +23,6 @@
23 23
  ***************************************************************************/
24 24
 
25 25
 /*
26
- * This header is supposed to eventually replace curlbuild.h. This little one
27
- * is still learning.  During the experimental phase, this header files
28
- * defines symbols using the prefixes CURLSYS_ or curlsys_. When we feel
29
- * confident enough, we replace curlbuild.h with this file and rename all
30
- * prefixes to CURL_ and curl_.
31
- */
32
-
33
-/*
34 26
  * Try to keep one section per platform, compiler and architecture, otherwise,
35 27
  * if an existing section is reused for a different one and later on the
36 28
  * original is adjusted, probably the piggybacking one can be adversely
@@ -60,323 +52,323 @@
60 52
 
61 53
 #if defined(__DJGPP__) || defined(__GO32__)
62 54
 #  if defined(__DJGPP__) && (__DJGPP__ > 1)
63
-#    define CURLSYS_SIZEOF_LONG           4
64
-#    define CURLSYS_TYPEOF_CURL_OFF_T     long long
65
-#    define CURLSYS_FORMAT_CURL_OFF_T     "lld"
66
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "llu"
67
-#    define CURLSYS_SIZEOF_CURL_OFF_T     8
68
-#    define CURLSYS_SUFFIX_CURL_OFF_T     LL
69
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    ULL
55
+#    define CURL_SIZEOF_LONG           4
56
+#    define CURL_TYPEOF_CURL_OFF_T     long long
57
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
58
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
59
+#    define CURL_SIZEOF_CURL_OFF_T     8
60
+#    define CURL_SUFFIX_CURL_OFF_T     LL
61
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
70 62
 #  else
71
-#    define CURLSYS_SIZEOF_LONG           4
72
-#    define CURLSYS_TYPEOF_CURL_OFF_T     long
73
-#    define CURLSYS_FORMAT_CURL_OFF_T     "ld"
74
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
75
-#    define CURLSYS_SIZEOF_CURL_OFF_T     4
76
-#    define CURLSYS_SUFFIX_CURL_OFF_T     L
77
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    UL
63
+#    define CURL_SIZEOF_LONG           4
64
+#    define CURL_TYPEOF_CURL_OFF_T     long
65
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
66
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
67
+#    define CURL_SIZEOF_CURL_OFF_T     4
68
+#    define CURL_SUFFIX_CURL_OFF_T     L
69
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
78 70
 #  endif
79
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T int
80
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
71
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
72
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
81 73
 
82 74
 #elif defined(__SALFORDC__)
83
-#  define CURLSYS_SIZEOF_LONG           4
84
-#  define CURLSYS_TYPEOF_CURL_OFF_T     long
85
-#  define CURLSYS_FORMAT_CURL_OFF_T     "ld"
86
-#  define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
87
-#  define CURLSYS_SIZEOF_CURL_OFF_T     4
88
-#  define CURLSYS_SUFFIX_CURL_OFF_T     L
89
-#  define CURLSYS_SUFFIX_CURL_OFF_TU    UL
90
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T int
91
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
75
+#  define CURL_SIZEOF_LONG           4
76
+#  define CURL_TYPEOF_CURL_OFF_T     long
77
+#  define CURL_FORMAT_CURL_OFF_T     "ld"
78
+#  define CURL_FORMAT_CURL_OFF_TU    "lu"
79
+#  define CURL_SIZEOF_CURL_OFF_T     4
80
+#  define CURL_SUFFIX_CURL_OFF_T     L
81
+#  define CURL_SUFFIX_CURL_OFF_TU    UL
82
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
83
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
92 84
 
93 85
 #elif defined(__BORLANDC__)
94 86
 #  if (__BORLANDC__ < 0x520)
95
-#    define CURLSYS_SIZEOF_LONG           4
96
-#    define CURLSYS_TYPEOF_CURL_OFF_T     long
97
-#    define CURLSYS_FORMAT_CURL_OFF_T     "ld"
98
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
99
-#    define CURLSYS_SIZEOF_CURL_OFF_T     4
100
-#    define CURLSYS_SUFFIX_CURL_OFF_T     L
101
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    UL
87
+#    define CURL_SIZEOF_LONG           4
88
+#    define CURL_TYPEOF_CURL_OFF_T     long
89
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
90
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
91
+#    define CURL_SIZEOF_CURL_OFF_T     4
92
+#    define CURL_SUFFIX_CURL_OFF_T     L
93
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
102 94
 #  else
103
-#    define CURLSYS_SIZEOF_LONG           4
104
-#    define CURLSYS_TYPEOF_CURL_OFF_T     __int64
105
-#    define CURLSYS_FORMAT_CURL_OFF_T     "I64d"
106
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "I64u"
107
-#    define CURLSYS_SIZEOF_CURL_OFF_T     8
108
-#    define CURLSYS_SUFFIX_CURL_OFF_T     i64
109
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    ui64
95
+#    define CURL_SIZEOF_LONG           4
96
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
97
+#    define CURL_FORMAT_CURL_OFF_T     "I64d"
98
+#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
99
+#    define CURL_SIZEOF_CURL_OFF_T     8
100
+#    define CURL_SUFFIX_CURL_OFF_T     i64
101
+#    define CURL_SUFFIX_CURL_OFF_TU    ui64
110 102
 #  endif
111
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T int
112
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
103
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
104
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
113 105
 
114 106
 #elif defined(__TURBOC__)
115
-#  define CURLSYS_SIZEOF_LONG           4
116
-#  define CURLSYS_TYPEOF_CURL_OFF_T     long
117
-#  define CURLSYS_FORMAT_CURL_OFF_T     "ld"
118
-#  define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
119
-#  define CURLSYS_SIZEOF_CURL_OFF_T     4
120
-#  define CURLSYS_SUFFIX_CURL_OFF_T     L
121
-#  define CURLSYS_SUFFIX_CURL_OFF_TU    UL
122
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T int
123
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
107
+#  define CURL_SIZEOF_LONG           4
108
+#  define CURL_TYPEOF_CURL_OFF_T     long
109
+#  define CURL_FORMAT_CURL_OFF_T     "ld"
110
+#  define CURL_FORMAT_CURL_OFF_TU    "lu"
111
+#  define CURL_SIZEOF_CURL_OFF_T     4
112
+#  define CURL_SUFFIX_CURL_OFF_T     L
113
+#  define CURL_SUFFIX_CURL_OFF_TU    UL
114
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
115
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
124 116
 
125 117
 #elif defined(__WATCOMC__)
126 118
 #  if defined(__386__)
127
-#    define CURLSYS_SIZEOF_LONG           4
128
-#    define CURLSYS_TYPEOF_CURL_OFF_T     __int64
129
-#    define CURLSYS_FORMAT_CURL_OFF_T     "I64d"
130
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "I64u"
131
-#    define CURLSYS_SIZEOF_CURL_OFF_T     8
132
-#    define CURLSYS_SUFFIX_CURL_OFF_T     i64
133
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    ui64
119
+#    define CURL_SIZEOF_LONG           4
120
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
121
+#    define CURL_FORMAT_CURL_OFF_T     "I64d"
122
+#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
123
+#    define CURL_SIZEOF_CURL_OFF_T     8
124
+#    define CURL_SUFFIX_CURL_OFF_T     i64
125
+#    define CURL_SUFFIX_CURL_OFF_TU    ui64
134 126
 #  else
135
-#    define CURLSYS_SIZEOF_LONG           4
136
-#    define CURLSYS_TYPEOF_CURL_OFF_T     long
137
-#    define CURLSYS_FORMAT_CURL_OFF_T     "ld"
138
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
139
-#    define CURLSYS_SIZEOF_CURL_OFF_T     4
140
-#    define CURLSYS_SUFFIX_CURL_OFF_T     L
141
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    UL
127
+#    define CURL_SIZEOF_LONG           4
128
+#    define CURL_TYPEOF_CURL_OFF_T     long
129
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
130
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
131
+#    define CURL_SIZEOF_CURL_OFF_T     4
132
+#    define CURL_SUFFIX_CURL_OFF_T     L
133
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
142 134
 #  endif
143
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T int
144
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
135
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
136
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
145 137
 
146 138
 #elif defined(__POCC__)
147 139
 #  if (__POCC__ < 280)
148
-#    define CURLSYS_SIZEOF_LONG           4
149
-#    define CURLSYS_TYPEOF_CURL_OFF_T     long
150
-#    define CURLSYS_FORMAT_CURL_OFF_T     "ld"
151
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
152
-#    define CURLSYS_SIZEOF_CURL_OFF_T     4
153
-#    define CURLSYS_SUFFIX_CURL_OFF_T     L
154
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    UL
140
+#    define CURL_SIZEOF_LONG           4
141
+#    define CURL_TYPEOF_CURL_OFF_T     long
142
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
143
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
144
+#    define CURL_SIZEOF_CURL_OFF_T     4
145
+#    define CURL_SUFFIX_CURL_OFF_T     L
146
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
155 147
 #  elif defined(_MSC_VER)
156
-#    define CURLSYS_SIZEOF_LONG           4
157
-#    define CURLSYS_TYPEOF_CURL_OFF_T     __int64
158
-#    define CURLSYS_FORMAT_CURL_OFF_T     "I64d"
159
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "I64u"
160
-#    define CURLSYS_SIZEOF_CURL_OFF_T     8
161
-#    define CURLSYS_SUFFIX_CURL_OFF_T     i64
162
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    ui64
148
+#    define CURL_SIZEOF_LONG           4
149
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
150
+#    define CURL_FORMAT_CURL_OFF_T     "I64d"
151
+#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
152
+#    define CURL_SIZEOF_CURL_OFF_T     8
153
+#    define CURL_SUFFIX_CURL_OFF_T     i64
154
+#    define CURL_SUFFIX_CURL_OFF_TU    ui64
163 155
 #  else
164
-#    define CURLSYS_SIZEOF_LONG           4
165
-#    define CURLSYS_TYPEOF_CURL_OFF_T     long long
166
-#    define CURLSYS_FORMAT_CURL_OFF_T     "lld"
167
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "llu"
168
-#    define CURLSYS_SIZEOF_CURL_OFF_T     8
169
-#    define CURLSYS_SUFFIX_CURL_OFF_T     LL
170
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    ULL
156
+#    define CURL_SIZEOF_LONG           4
157
+#    define CURL_TYPEOF_CURL_OFF_T     long long
158
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
159
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
160
+#    define CURL_SIZEOF_CURL_OFF_T     8
161
+#    define CURL_SUFFIX_CURL_OFF_T     LL
162
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
171 163
 #  endif
172
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T int
173
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
164
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
165
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
174 166
 
175 167
 #elif defined(__LCC__)
176
-#  define CURLSYS_SIZEOF_LONG           4
177
-#  define CURLSYS_TYPEOF_CURL_OFF_T     long
178
-#  define CURLSYS_FORMAT_CURL_OFF_T     "ld"
179
-#  define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
180
-#  define CURLSYS_SIZEOF_CURL_OFF_T     4
181
-#  define CURLSYS_SUFFIX_CURL_OFF_T     L
182
-#  define CURLSYS_SUFFIX_CURL_OFF_TU    UL
183
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T int
184
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
168
+#  define CURL_SIZEOF_LONG           4
169
+#  define CURL_TYPEOF_CURL_OFF_T     long
170
+#  define CURL_FORMAT_CURL_OFF_T     "ld"
171
+#  define CURL_FORMAT_CURL_OFF_TU    "lu"
172
+#  define CURL_SIZEOF_CURL_OFF_T     4
173
+#  define CURL_SUFFIX_CURL_OFF_T     L
174
+#  define CURL_SUFFIX_CURL_OFF_TU    UL
175
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
176
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
185 177
 
186 178
 #elif defined(__SYMBIAN32__)
187 179
 #  if defined(__EABI__)  /* Treat all ARM compilers equally */
188
-#    define CURLSYS_SIZEOF_LONG           4
189
-#    define CURLSYS_TYPEOF_CURL_OFF_T     long long
190
-#    define CURLSYS_FORMAT_CURL_OFF_T     "lld"
191
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "llu"
192
-#    define CURLSYS_SIZEOF_CURL_OFF_T     8
193
-#    define CURLSYS_SUFFIX_CURL_OFF_T     LL
194
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    ULL
180
+#    define CURL_SIZEOF_LONG           4
181
+#    define CURL_TYPEOF_CURL_OFF_T     long long
182
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
183
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
184
+#    define CURL_SIZEOF_CURL_OFF_T     8
185
+#    define CURL_SUFFIX_CURL_OFF_T     LL
186
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
195 187
 #  elif defined(__CW32__)
196 188
 #    pragma longlong on
197
-#    define CURLSYS_SIZEOF_LONG           4
198
-#    define CURLSYS_TYPEOF_CURL_OFF_T     long long
199
-#    define CURLSYS_FORMAT_CURL_OFF_T     "lld"
200
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "llu"
201
-#    define CURLSYS_SIZEOF_CURL_OFF_T     8
202
-#    define CURLSYS_SUFFIX_CURL_OFF_T     LL
203
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    ULL
189
+#    define CURL_SIZEOF_LONG           4
190
+#    define CURL_TYPEOF_CURL_OFF_T     long long
191
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
192
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
193
+#    define CURL_SIZEOF_CURL_OFF_T     8
194
+#    define CURL_SUFFIX_CURL_OFF_T     LL
195
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
204 196
 #  elif defined(__VC32__)
205
-#    define CURLSYS_SIZEOF_LONG           4
206
-#    define CURLSYS_TYPEOF_CURL_OFF_T     __int64
207
-#    define CURLSYS_FORMAT_CURL_OFF_T     "lld"
208
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "llu"
209
-#    define CURLSYS_SIZEOF_CURL_OFF_T     8
210
-#    define CURLSYS_SUFFIX_CURL_OFF_T     LL
211
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    ULL
197
+#    define CURL_SIZEOF_LONG           4
198
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
199
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
200
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
201
+#    define CURL_SIZEOF_CURL_OFF_T     8
202
+#    define CURL_SUFFIX_CURL_OFF_T     LL
203
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
212 204
 #  endif
213
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T unsigned int
214
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
205
+#  define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
206
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
215 207
 
216 208
 #elif defined(__MWERKS__)
217
-#  define CURLSYS_SIZEOF_LONG           4
218
-#  define CURLSYS_TYPEOF_CURL_OFF_T     long long
219
-#  define CURLSYS_FORMAT_CURL_OFF_T     "lld"
220
-#  define CURLSYS_FORMAT_CURL_OFF_TU    "llu"
221
-#  define CURLSYS_SIZEOF_CURL_OFF_T     8
222
-#  define CURLSYS_SUFFIX_CURL_OFF_T     LL
223
-#  define CURLSYS_SUFFIX_CURL_OFF_TU    ULL
224
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T int
225
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
209
+#  define CURL_SIZEOF_LONG           4
210
+#  define CURL_TYPEOF_CURL_OFF_T     long long
211
+#  define CURL_FORMAT_CURL_OFF_T     "lld"
212
+#  define CURL_FORMAT_CURL_OFF_TU    "llu"
213
+#  define CURL_SIZEOF_CURL_OFF_T     8
214
+#  define CURL_SUFFIX_CURL_OFF_T     LL
215
+#  define CURL_SUFFIX_CURL_OFF_TU    ULL
216
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
217
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
226 218
 
227 219
 #elif defined(_WIN32_WCE)
228
-#  define CURLSYS_SIZEOF_LONG           4
229
-#  define CURLSYS_TYPEOF_CURL_OFF_T     __int64
230
-#  define CURLSYS_FORMAT_CURL_OFF_T     "I64d"
231
-#  define CURLSYS_FORMAT_CURL_OFF_TU    "I64u"
232
-#  define CURLSYS_SIZEOF_CURL_OFF_T     8
233
-#  define CURLSYS_SUFFIX_CURL_OFF_T     i64
234
-#  define CURLSYS_SUFFIX_CURL_OFF_TU    ui64
235
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T int
236
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
220
+#  define CURL_SIZEOF_LONG           4
221
+#  define CURL_TYPEOF_CURL_OFF_T     __int64
222
+#  define CURL_FORMAT_CURL_OFF_T     "I64d"
223
+#  define CURL_FORMAT_CURL_OFF_TU    "I64u"
224
+#  define CURL_SIZEOF_CURL_OFF_T     8
225
+#  define CURL_SUFFIX_CURL_OFF_T     i64
226
+#  define CURL_SUFFIX_CURL_OFF_TU    ui64
227
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
228
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
237 229
 
238 230
 #elif defined(__MINGW32__)
239
-#  define CURLSYS_SIZEOF_LONG           4
240
-#  define CURLSYS_TYPEOF_CURL_OFF_T     long long
241
-#  define CURLSYS_FORMAT_CURL_OFF_T     "I64d"
242
-#  define CURLSYS_FORMAT_CURL_OFF_TU    "I64u"
243
-#  define CURLSYS_SIZEOF_CURL_OFF_T     8
244
-#  define CURLSYS_SUFFIX_CURL_OFF_T     LL
245
-#  define CURLSYS_SUFFIX_CURL_OFF_TU    ULL
246
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T socklen_t
247
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
248
-#  define CURLSYS_PULL_SYS_TYPES_H      1
249
-#  define CURLSYS_PULL_WS2TCPIP_H       1
231
+#  define CURL_SIZEOF_LONG           4
232
+#  define CURL_TYPEOF_CURL_OFF_T     long long
233
+#  define CURL_FORMAT_CURL_OFF_T     "I64d"
234
+#  define CURL_FORMAT_CURL_OFF_TU    "I64u"
235
+#  define CURL_SIZEOF_CURL_OFF_T     8
236
+#  define CURL_SUFFIX_CURL_OFF_T     LL
237
+#  define CURL_SUFFIX_CURL_OFF_TU    ULL
238
+#  define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
239
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
240
+#  define CURL_PULL_SYS_TYPES_H      1
241
+#  define CURL_PULL_WS2TCPIP_H       1
250 242
 
251 243
 #elif defined(__VMS)
252 244
 #  if defined(__VAX)
253
-#    define CURLSYS_SIZEOF_LONG           4
254
-#    define CURLSYS_TYPEOF_CURL_OFF_T     long
255
-#    define CURLSYS_FORMAT_CURL_OFF_T     "ld"
256
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
257
-#    define CURLSYS_SIZEOF_CURL_OFF_T     4
258
-#    define CURLSYS_SUFFIX_CURL_OFF_T     L
259
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    UL
245
+#    define CURL_SIZEOF_LONG           4
246
+#    define CURL_TYPEOF_CURL_OFF_T     long
247
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
248
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
249
+#    define CURL_SIZEOF_CURL_OFF_T     4
250
+#    define CURL_SUFFIX_CURL_OFF_T     L
251
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
260 252
 #  else
261
-#    define CURLSYS_SIZEOF_LONG           4
262
-#    define CURLSYS_TYPEOF_CURL_OFF_T     long long
263
-#    define CURLSYS_FORMAT_CURL_OFF_T     "lld"
264
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "llu"
265
-#    define CURLSYS_SIZEOF_CURL_OFF_T     8
266
-#    define CURLSYS_SUFFIX_CURL_OFF_T     LL
267
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    ULL
253
+#    define CURL_SIZEOF_LONG           4
254
+#    define CURL_TYPEOF_CURL_OFF_T     long long
255
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
256
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
257
+#    define CURL_SIZEOF_CURL_OFF_T     8
258
+#    define CURL_SUFFIX_CURL_OFF_T     LL
259
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
268 260
 #  endif
269
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T unsigned int
270
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
261
+#  define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
262
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
271 263
 
272 264
 #elif defined(__OS400__)
273 265
 #  if defined(__ILEC400__)
274
-#    define CURLSYS_SIZEOF_LONG           4
275
-#    define CURLSYS_TYPEOF_CURL_OFF_T     long long
276
-#    define CURLSYS_FORMAT_CURL_OFF_T     "lld"
277
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "llu"
278
-#    define CURLSYS_SIZEOF_CURL_OFF_T     8
279
-#    define CURLSYS_SUFFIX_CURL_OFF_T     LL
280
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    ULL
281
-#    define CURLSYS_TYPEOF_CURL_SOCKLEN_T socklen_t
282
-#    define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
283
-#    define CURLSYS_PULL_SYS_TYPES_H      1
284
-#    define CURLSYS_PULL_SYS_SOCKET_H     1
266
+#    define CURL_SIZEOF_LONG           4
267
+#    define CURL_TYPEOF_CURL_OFF_T     long long
268
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
269
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
270
+#    define CURL_SIZEOF_CURL_OFF_T     8
271
+#    define CURL_SUFFIX_CURL_OFF_T     LL
272
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
273
+#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
274
+#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
275
+#    define CURL_PULL_SYS_TYPES_H      1
276
+#    define CURL_PULL_SYS_SOCKET_H     1
285 277
 #  endif
286 278
 
287 279
 #elif defined(__MVS__)
288 280
 #  if defined(__IBMC__) || defined(__IBMCPP__)
289 281
 #    if defined(_ILP32)
290
-#      define CURLSYS_SIZEOF_LONG           4
282
+#      define CURL_SIZEOF_LONG           4
291 283
 #    elif defined(_LP64)
292
-#      define CURLSYS_SIZEOF_LONG           8
284
+#      define CURL_SIZEOF_LONG           8
293 285
 #    endif
294 286
 #    if defined(_LONG_LONG)
295
-#      define CURLSYS_TYPEOF_CURL_OFF_T     long long
296
-#      define CURLSYS_FORMAT_CURL_OFF_T     "lld"
297
-#      define CURLSYS_FORMAT_CURL_OFF_TU    "llu"
298
-#      define CURLSYS_SIZEOF_CURL_OFF_T     8
299
-#      define CURLSYS_SUFFIX_CURL_OFF_T     LL
300
-#      define CURLSYS_SUFFIX_CURL_OFF_TU    ULL
287
+#      define CURL_TYPEOF_CURL_OFF_T     long long
288
+#      define CURL_FORMAT_CURL_OFF_T     "lld"
289
+#      define CURL_FORMAT_CURL_OFF_TU    "llu"
290
+#      define CURL_SIZEOF_CURL_OFF_T     8
291
+#      define CURL_SUFFIX_CURL_OFF_T     LL
292
+#      define CURL_SUFFIX_CURL_OFF_TU    ULL
301 293
 #    elif defined(_LP64)
302
-#      define CURLSYS_TYPEOF_CURL_OFF_T     long
303
-#      define CURLSYS_FORMAT_CURL_OFF_T     "ld"
304
-#      define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
305
-#      define CURLSYS_SIZEOF_CURL_OFF_T     8
306
-#      define CURLSYS_SUFFIX_CURL_OFF_T     L
307
-#      define CURLSYS_SUFFIX_CURL_OFF_TU    UL
294
+#      define CURL_TYPEOF_CURL_OFF_T     long
295
+#      define CURL_FORMAT_CURL_OFF_T     "ld"
296
+#      define CURL_FORMAT_CURL_OFF_TU    "lu"
297
+#      define CURL_SIZEOF_CURL_OFF_T     8
298
+#      define CURL_SUFFIX_CURL_OFF_T     L
299
+#      define CURL_SUFFIX_CURL_OFF_TU    UL
308 300
 #    else
309
-#      define CURLSYS_TYPEOF_CURL_OFF_T     long
310
-#      define CURLSYS_FORMAT_CURL_OFF_T     "ld"
311
-#      define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
312
-#      define CURLSYS_SIZEOF_CURL_OFF_T     4
313
-#      define CURLSYS_SUFFIX_CURL_OFF_T     L
314
-#      define CURLSYS_SUFFIX_CURL_OFF_TU    UL
301
+#      define CURL_TYPEOF_CURL_OFF_T     long
302
+#      define CURL_FORMAT_CURL_OFF_T     "ld"
303
+#      define CURL_FORMAT_CURL_OFF_TU    "lu"
304
+#      define CURL_SIZEOF_CURL_OFF_T     4
305
+#      define CURL_SUFFIX_CURL_OFF_T     L
306
+#      define CURL_SUFFIX_CURL_OFF_TU    UL
315 307
 #    endif
316
-#    define CURLSYS_TYPEOF_CURL_SOCKLEN_T socklen_t
317
-#    define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
318
-#    define CURLSYS_PULL_SYS_TYPES_H      1
319
-#    define CURLSYS_PULL_SYS_SOCKET_H     1
308
+#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
309
+#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
310
+#    define CURL_PULL_SYS_TYPES_H      1
311
+#    define CURL_PULL_SYS_SOCKET_H     1
320 312
 #  endif
321 313
 
322 314
 #elif defined(__370__)
323 315
 #  if defined(__IBMC__) || defined(__IBMCPP__)
324 316
 #    if defined(_ILP32)
325
-#      define CURLSYS_SIZEOF_LONG           4
317
+#      define CURL_SIZEOF_LONG           4
326 318
 #    elif defined(_LP64)
327
-#      define CURLSYS_SIZEOF_LONG           8
319
+#      define CURL_SIZEOF_LONG           8
328 320
 #    endif
329 321
 #    if defined(_LONG_LONG)
330
-#      define CURLSYS_TYPEOF_CURL_OFF_T     long long
331
-#      define CURLSYS_FORMAT_CURL_OFF_T     "lld"
332
-#      define CURLSYS_FORMAT_CURL_OFF_TU    "llu"
333
-#      define CURLSYS_SIZEOF_CURL_OFF_T     8
334
-#      define CURLSYS_SUFFIX_CURL_OFF_T     LL
335
-#      define CURLSYS_SUFFIX_CURL_OFF_TU    ULL
322
+#      define CURL_TYPEOF_CURL_OFF_T     long long
323
+#      define CURL_FORMAT_CURL_OFF_T     "lld"
324
+#      define CURL_FORMAT_CURL_OFF_TU    "llu"
325
+#      define CURL_SIZEOF_CURL_OFF_T     8
326
+#      define CURL_SUFFIX_CURL_OFF_T     LL
327
+#      define CURL_SUFFIX_CURL_OFF_TU    ULL
336 328
 #    elif defined(_LP64)
337
-#      define CURLSYS_TYPEOF_CURL_OFF_T     long
338
-#      define CURLSYS_FORMAT_CURL_OFF_T     "ld"
339
-#      define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
340
-#      define CURLSYS_SIZEOF_CURL_OFF_T     8
341
-#      define CURLSYS_SUFFIX_CURL_OFF_T     L
342
-#      define CURLSYS_SUFFIX_CURL_OFF_TU    UL
329
+#      define CURL_TYPEOF_CURL_OFF_T     long
330
+#      define CURL_FORMAT_CURL_OFF_T     "ld"
331
+#      define CURL_FORMAT_CURL_OFF_TU    "lu"
332
+#      define CURL_SIZEOF_CURL_OFF_T     8
333
+#      define CURL_SUFFIX_CURL_OFF_T     L
334
+#      define CURL_SUFFIX_CURL_OFF_TU    UL
343 335
 #    else
344
-#      define CURLSYS_TYPEOF_CURL_OFF_T     long
345
-#      define CURLSYS_FORMAT_CURL_OFF_T     "ld"
346
-#      define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
347
-#      define CURLSYS_SIZEOF_CURL_OFF_T     4
348
-#      define CURLSYS_SUFFIX_CURL_OFF_T     L
349
-#      define CURLSYS_SUFFIX_CURL_OFF_TU    UL
336
+#      define CURL_TYPEOF_CURL_OFF_T     long
337
+#      define CURL_FORMAT_CURL_OFF_T     "ld"
338
+#      define CURL_FORMAT_CURL_OFF_TU    "lu"
339
+#      define CURL_SIZEOF_CURL_OFF_T     4
340
+#      define CURL_SUFFIX_CURL_OFF_T     L
341
+#      define CURL_SUFFIX_CURL_OFF_TU    UL
350 342
 #    endif
351
-#    define CURLSYS_TYPEOF_CURL_SOCKLEN_T socklen_t
352
-#    define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
353
-#    define CURLSYS_PULL_SYS_TYPES_H      1
354
-#    define CURLSYS_PULL_SYS_SOCKET_H     1
343
+#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
344
+#    define CURL_SIZEOF_CURL_SOCKLEN_T 4
345
+#    define CURL_PULL_SYS_TYPES_H      1
346
+#    define CURL_PULL_SYS_SOCKET_H     1
355 347
 #  endif
356 348
 
357 349
 #elif defined(TPF)
358
-#  define CURLSYS_SIZEOF_LONG           8
359
-#  define CURLSYS_TYPEOF_CURL_OFF_T     long
360
-#  define CURLSYS_FORMAT_CURL_OFF_T     "ld"
361
-#  define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
362
-#  define CURLSYS_SIZEOF_CURL_OFF_T     8
363
-#  define CURLSYS_SUFFIX_CURL_OFF_T     L
364
-#  define CURLSYS_SUFFIX_CURL_OFF_TU    UL
365
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T int
366
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
350
+#  define CURL_SIZEOF_LONG           8
351
+#  define CURL_TYPEOF_CURL_OFF_T     long
352
+#  define CURL_FORMAT_CURL_OFF_T     "ld"
353
+#  define CURL_FORMAT_CURL_OFF_TU    "lu"
354
+#  define CURL_SIZEOF_CURL_OFF_T     8
355
+#  define CURL_SUFFIX_CURL_OFF_T     L
356
+#  define CURL_SUFFIX_CURL_OFF_TU    UL
357
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
358
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
367 359
 
368 360
 #elif defined(__TINYC__) /* also known as tcc */
369 361
 
370
-#  define CURLSYS_SIZEOF_LONG           4
371
-#  define CURLSYS_TYPEOF_CURL_OFF_T     long long
372
-#  define CURLSYS_FORMAT_CURL_OFF_T     "lld"
373
-#  define CURLSYS_FORMAT_CURL_OFF_TU    "llu"
374
-#  define CURLSYS_SIZEOF_CURL_OFF_T     8
375
-#  define CURLSYS_SUFFIX_CURL_OFF_T     LL
376
-#  define CURLSYS_SUFFIX_CURL_OFF_TU    ULL
377
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T socklen_t
378
-#  define CURLSYS_PULL_SYS_TYPES_H      1
379
-#  define CURLSYS_PULL_SYS_SOCKET_H     1
362
+#  define CURL_SIZEOF_LONG           4
363
+#  define CURL_TYPEOF_CURL_OFF_T     long long
364
+#  define CURL_FORMAT_CURL_OFF_T     "lld"
365
+#  define CURL_FORMAT_CURL_OFF_TU    "llu"
366
+#  define CURL_SIZEOF_CURL_OFF_T     8
367
+#  define CURL_SUFFIX_CURL_OFF_T     LL
368
+#  define CURL_SUFFIX_CURL_OFF_TU    ULL
369
+#  define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
370
+#  define CURL_PULL_SYS_TYPES_H      1
371
+#  define CURL_PULL_SYS_SOCKET_H     1
380 372
 
381 373
 /* ===================================== */
382 374
 /*    KEEP MSVC THE PENULTIMATE ENTRY    */
@@ -384,24 +376,24 @@
384 376
 
385 377
 #elif defined(_MSC_VER)
386 378
 #  if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
387
-#    define CURLSYS_SIZEOF_LONG           4
388
-#    define CURLSYS_TYPEOF_CURL_OFF_T     __int64
389
-#    define CURLSYS_FORMAT_CURL_OFF_T     "I64d"
390
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "I64u"
391
-#    define CURLSYS_SIZEOF_CURL_OFF_T     8
392
-#    define CURLSYS_SUFFIX_CURL_OFF_T     i64
393
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    ui64
379
+#    define CURL_SIZEOF_LONG           4
380
+#    define CURL_TYPEOF_CURL_OFF_T     __int64
381
+#    define CURL_FORMAT_CURL_OFF_T     "I64d"
382
+#    define CURL_FORMAT_CURL_OFF_TU    "I64u"
383
+#    define CURL_SIZEOF_CURL_OFF_T     8
384
+#    define CURL_SUFFIX_CURL_OFF_T     i64
385
+#    define CURL_SUFFIX_CURL_OFF_TU    ui64
394 386
 #  else
395
-#    define CURLSYS_SIZEOF_LONG           4
396
-#    define CURLSYS_TYPEOF_CURL_OFF_T     long
397
-#    define CURLSYS_FORMAT_CURL_OFF_T     "ld"
398
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
399
-#    define CURLSYS_SIZEOF_CURL_OFF_T     4
400
-#    define CURLSYS_SUFFIX_CURL_OFF_T     L
401
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    UL
387
+#    define CURL_SIZEOF_LONG           4
388
+#    define CURL_TYPEOF_CURL_OFF_T     long
389
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
390
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
391
+#    define CURL_SIZEOF_CURL_OFF_T     4
392
+#    define CURL_SUFFIX_CURL_OFF_T     L
393
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
402 394
 #  endif
403
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T int
404
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
395
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
396
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
405 397
 
406 398
 /* ===================================== */
407 399
 /*    KEEP GENERIC GCC THE LAST ENTRY    */
@@ -411,39 +403,39 @@
411 403
 #  if !defined(__LP64__) && (defined(__ILP32__) || \
412 404
       defined(__i386__) || defined(__ppc__) || defined(__arm__) || \
413 405
       defined(__sparc__) || defined(__mips__) || defined(__sh__))
414
-#    define CURLSYS_SIZEOF_LONG           4
415
-#    define CURLSYS_TYPEOF_CURL_OFF_T     long long
416
-#    define CURLSYS_FORMAT_CURL_OFF_T     "lld"
417
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "llu"
418
-#    define CURLSYS_SIZEOF_CURL_OFF_T     8
419
-#    define CURLSYS_SUFFIX_CURL_OFF_T     LL
420
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    ULL
406
+#    define CURL_SIZEOF_LONG           4
407
+#    define CURL_TYPEOF_CURL_OFF_T     long long
408
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
409
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
410
+#    define CURL_SIZEOF_CURL_OFF_T     8
411
+#    define CURL_SUFFIX_CURL_OFF_T     LL
412
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
421 413
 #  elif defined(__LP64__) || \
422 414
         defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__)
423
-#    define CURLSYS_SIZEOF_LONG           8
424
-#    define CURLSYS_TYPEOF_CURL_OFF_T     long
425
-#    define CURLSYS_FORMAT_CURL_OFF_T     "ld"
426
-#    define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
427
-#    define CURLSYS_SIZEOF_CURL_OFF_T     8
428
-#    define CURLSYS_SUFFIX_CURL_OFF_T     L
429
-#    define CURLSYS_SUFFIX_CURL_OFF_TU    UL
415
+#    define CURL_SIZEOF_LONG           8
416
+#    define CURL_TYPEOF_CURL_OFF_T     long
417
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
418
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
419
+#    define CURL_SIZEOF_CURL_OFF_T     8
420
+#    define CURL_SUFFIX_CURL_OFF_T     L
421
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
430 422
 #  endif
431
-#  define CURLSYS_TYPEOF_CURL_SOCKLEN_T socklen_t
432
-#  define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
433
-#  define CURLSYS_PULL_SYS_TYPES_H      1
434
-#  define CURLSYS_PULL_SYS_SOCKET_H     1
423
+#  define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
424
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
425
+#  define CURL_PULL_SYS_TYPES_H      1
426
+#  define CURL_PULL_SYS_SOCKET_H     1
435 427
 
436 428
 #else
437 429
 /* generic "safe guess" on old 32 bit style */
438
-# define CURLSYS_SIZEOF_LONG 4
439
-# define CURLSYS_SIZEOF_CURL_SOCKLEN_T 4
440
-# define CURLSYS_SIZEOF_CURL_OFF_T 4
441
-# define CURLSYS_TYPEOF_CURL_OFF_T     long
442
-# define CURLSYS_FORMAT_CURL_OFF_T     "ld"
443
-# define CURLSYS_FORMAT_CURL_OFF_TU    "lu"
444
-# define CURLSYS_SUFFIX_CURL_OFF_T     L
445
-# define CURLSYS_SUFFIX_CURL_OFF_TU    UL
446
-# define CURLSYS_TYPEOF_CURL_SOCKLEN_T int
430
+# define CURL_SIZEOF_LONG 4
431
+# define CURL_SIZEOF_CURL_SOCKLEN_T 4
432
+# define CURL_SIZEOF_CURL_OFF_T 4
433
+# define CURL_TYPEOF_CURL_OFF_T     long
434
+# define CURL_FORMAT_CURL_OFF_T     "ld"
435
+# define CURL_FORMAT_CURL_OFF_TU    "lu"
436
+# define CURL_SUFFIX_CURL_OFF_T     L
437
+# define CURL_SUFFIX_CURL_OFF_TU    UL
438
+# define CURL_TYPEOF_CURL_SOCKLEN_T int
447 439
 #endif
448 440
 
449 441
 /* CURLSYS_PULL_WS2TCPIP_H is defined above when inclusion of header file  */
@@ -457,27 +449,75 @@
457 449
 #  include <ws2tcpip.h>
458 450
 #endif
459 451
 
460
-/* CURLSYS_PULL_SYS_TYPES_H is defined above when inclusion of header file  */
452
+/* CURL_PULL_SYS_TYPES_H is defined above when inclusion of header file  */
461 453
 /* sys/types.h is required here to properly make type definitions below. */
462
-#ifdef CURLSYS_PULL_SYS_TYPES_H
454
+#ifdef CURL_PULL_SYS_TYPES_H
463 455
 #  include <sys/types.h>
464 456
 #endif
465 457
 
466
-/* CURLSYS_PULL_SYS_SOCKET_H is defined above when inclusion of header file  */
458
+/* CURL_PULL_SYS_SOCKET_H is defined above when inclusion of header file  */
467 459
 /* sys/socket.h is required here to properly make type definitions below. */
468
-#ifdef CURLSYS_PULL_SYS_SOCKET_H
460
+#ifdef CURL_PULL_SYS_SOCKET_H
469 461
 #  include <sys/socket.h>
470 462
 #endif
471 463
 
472 464
 /* Data type definition of curl_socklen_t. */
473
-#ifdef CURLSYS_TYPEOF_CURL_SOCKLEN_T
474
-  typedef CURLSYS_TYPEOF_CURL_SOCKLEN_T curlsys_socklen_t;
465
+#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
466
+  typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
475 467
 #endif
476 468
 
477 469
 /* Data type definition of curl_off_t. */
478 470
 
479
-#ifdef CURLSYS_TYPEOF_CURL_OFF_T
480
-  typedef CURLSYS_TYPEOF_CURL_OFF_T curlsys_off_t;
471
+#ifdef CURL_TYPEOF_CURL_OFF_T
472
+  typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
473
+#endif
474
+
475
+/*
476
+ * CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow
477
+ * these to be visible and exported by the external libcurl interface API,
478
+ * while also making them visible to the library internals, simply including
479
+ * curl_setup.h, without actually needing to include curl.h internally.
480
+ * If some day this section would grow big enough, all this should be moved
481
+ * to its own header file.
482
+ */
483
+
484
+/*
485
+ * Figure out if we can use the ## preprocessor operator, which is supported
486
+ * by ISO/ANSI C and C++. Some compilers support it without setting __STDC__
487
+ * or  __cplusplus so we need to carefully check for them too.
488
+ */
489
+
490
+#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
491
+  defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \
492
+  defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \
493
+  defined(__ILEC400__)
494
+  /* This compiler is believed to have an ISO compatible preprocessor */
495
+#define CURL_ISOCPP
496
+#else
497
+  /* This compiler is believed NOT to have an ISO compatible preprocessor */
498
+#undef CURL_ISOCPP
499
+#endif
500
+
501
+/*
502
+ * Macros for minimum-width signed and unsigned curl_off_t integer constants.
503
+ */
504
+
505
+#if defined(__BORLANDC__) && (__BORLANDC__ == 0x0551)
506
+#  define __CURL_OFF_T_C_HLPR2(x) x
507
+#  define __CURL_OFF_T_C_HLPR1(x) __CURL_OFF_T_C_HLPR2(x)
508
+#  define CURL_OFF_T_C(Val)  __CURL_OFF_T_C_HLPR1(Val) ## \
509
+                             __CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_T)
510
+#  define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val) ## \
511
+                             __CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_TU)
512
+#else
513
+#  ifdef CURL_ISOCPP
514
+#    define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val ## Suffix
515
+#  else
516
+#    define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val/**/Suffix
517
+#  endif
518
+#  define __CURL_OFF_T_C_HLPR1(Val,Suffix) __CURL_OFF_T_C_HLPR2(Val,Suffix)
519
+#  define CURL_OFF_T_C(Val)  __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_T)
520
+#  define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_TU)
481 521
 #endif
482 522
 
483 523
 #endif /* __CURL_SYSTEM_H */

+ 0
- 3
lib/CMakeLists.txt View File

@@ -1,7 +1,5 @@
1 1
 set(LIB_NAME libcurl)
2 2
 
3
-configure_file(${CURL_SOURCE_DIR}/include/curl/curlbuild.h.cmake
4
-  ${CURL_BINARY_DIR}/include/curl/curlbuild.h)
5 3
 configure_file(curl_config.h.cmake
6 4
   ${CMAKE_CURRENT_BINARY_DIR}/curl_config.h)
7 5
 
@@ -10,7 +8,6 @@ include(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake)
10 8
 
11 9