summaryrefslogtreecommitdiffstats
path: root/lib/curl_setup.h
diff options
context:
space:
mode:
authorCurl Upstream <curl-library@cool.haxx.se>2018-09-04 21:49:50 (GMT)
committerBrad King <brad.king@kitware.com>2018-10-22 12:24:16 (GMT)
commit18812a9c3d395b368d8f3d85394b346472c8e858 (patch)
treeab391413091d9538c9ee6b25ab3ff8e54f9cbac0 /lib/curl_setup.h
parentd431136e029c652f5913bcebeaab3b9236b114c4 (diff)
downloadCMake-18812a9c3d395b368d8f3d85394b346472c8e858.zip
CMake-18812a9c3d395b368d8f3d85394b346472c8e858.tar.gz
CMake-18812a9c3d395b368d8f3d85394b346472c8e858.tar.bz2
curl 2018-09-04 (432eb5f5)
Code extracted from: https://github.com/curl/curl.git at commit 432eb5f5c254ee8383b2522ce597c9219877923e (curl-7_61_1).
Diffstat (limited to 'lib/curl_setup.h')
-rw-r--r--lib/curl_setup.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 5593a3b..2498987 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -217,7 +217,7 @@
/*
* Use getaddrinfo to resolve the IPv4 address literal. If the current network
- * interface doesn’t support IPv4, but supports IPv6, NAT64, and DNS64,
+ * interface doesn't support IPv4, but supports IPv6, NAT64, and DNS64,
* performing this task will result in a synthesized IPv6 address.
*/
#ifdef __APPLE__
@@ -242,6 +242,7 @@
# if defined(_UNICODE) && !defined(UNICODE)
# define UNICODE
# endif
+# include <winerror.h>
# include <windows.h>
# ifdef HAVE_WINSOCK2_H
# include <winsock2.h>
@@ -800,4 +801,16 @@ endings either CRLF or LF so 't' is appropriate.
#define CURL_SA_FAMILY_T unsigned short
#endif
+/* Some convenience macros to get the larger/smaller value out of two given.
+ We prefix with CURL to prevent name collisions. */
+#define CURLMAX(x,y) ((x)>(y)?(x):(y))
+#define CURLMIN(x,y) ((x)<(y)?(x):(y))
+
+/* Some versions of the Android SDK is missing the declaration */
+#if defined(HAVE_GETPWUID_R) && defined(HAVE_DECL_GETPWUID_R_MISSING)
+struct passwd;
+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buf,
+ size_t buflen, struct passwd **result);
+#endif
+
#endif /* HEADER_CURL_SETUP_H */