summaryrefslogtreecommitdiffstats
path: root/lib/curl_setup.h
diff options
context:
space:
mode:
authorCurl Upstream <curl-library@cool.haxx.se>2018-01-23 21:49:00 (GMT)
committerBrad King <brad.king@kitware.com>2018-01-24 19:14:23 (GMT)
commitaf9e654045f11028e50dac4781e297834129a749 (patch)
tree028fac729d317112e5790204712f4b4c7985a0de /lib/curl_setup.h
parentde7c21d677db1ddaeece03c19e13e448f4031511 (diff)
downloadCMake-af9e654045f11028e50dac4781e297834129a749.zip
CMake-af9e654045f11028e50dac4781e297834129a749.tar.gz
CMake-af9e654045f11028e50dac4781e297834129a749.tar.bz2
curl 2018-01-23 (d6c21c8e)
Code extracted from: https://github.com/curl/curl.git at commit d6c21c8eec597a925d2b647cff3d58ac69de01a0 (curl-7_58_0).
Diffstat (limited to 'lib/curl_setup.h')
-rw-r--r--lib/curl_setup.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 402ebc0..609ee9e 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -416,6 +416,14 @@
# endif
#endif
+#if (SIZEOF_CURL_OFF_T == 4)
+# define CURL_OFF_T_MAX CURL_OFF_T_C(0x7FFFFFFF)
+#else
+ /* assume CURL_SIZEOF_CURL_OFF_T == 8 */
+# define CURL_OFF_T_MAX CURL_OFF_T_C(0x7FFFFFFFFFFFFFFF)
+#endif
+#define CURL_OFF_T_MIN (-CURL_OFF_T_MAX - CURL_OFF_T_C(1))
+
/*
* Arg 2 type for gethostname in case it hasn't been defined in config file.
*/
@@ -751,9 +759,10 @@ endings either CRLF or LF so 't' is appropriate.
/* Detect Windows App environment which has a restricted access
* to the Win32 APIs. */
-# if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602)
+# if (defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602)) || \
+ defined(WINAPI_FAMILY)
# include <winapifamily.h>
-# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
+# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
# define CURL_WINDOWS_APP
# endif