blob: ddeab806f7e11470bf7c0653bc63b5a112aed4a7 [file] [log] [blame]
Alex Deymod5664862016-06-28 16:26:00 -07001diff --git a/lib/curl_config.h b/lib/curl_config.h
Alex Deymo486467e2017-12-19 19:04:07 +01002index f9aef69e2..f5ba92735 100644
Alex Deymod5664862016-06-28 16:26:00 -07003--- a/lib/curl_config.h
4+++ b/lib/curl_config.h
Alex Deymo486467e2017-12-19 19:04:07 +01005@@ -143,7 +143,10 @@
6 /* #undef HAVE_BUILTIN_AVAILABLE */
Alex Deymod5664862016-06-28 16:26:00 -07007
8 /* Define to 1 if you have the clock_gettime function and monotonic timer. */
Alex Deymo16246822017-11-28 14:10:40 +01009+#if !defined(__APPLE__)
Alex Deymod5664862016-06-28 16:26:00 -070010+/* CLOCK_MONOTONIC is not defined in mac when building for the host. */
11 #define HAVE_CLOCK_GETTIME_MONOTONIC 1
12+#endif
13
14 /* Define to 1 if you have the closesocket function. */
15 /* #undef HAVE_CLOSESOCKET */
Alex Deymo486467e2017-12-19 19:04:07 +010016@@ -454,10 +457,14 @@
Alex Deymod5664862016-06-28 16:26:00 -070017 #define HAVE_MEMORY_H 1
18
19 /* Define to 1 if you have the memrchr function or macro. */
Alex Deymo16246822017-11-28 14:10:40 +010020+#if !defined(__APPLE__)
Alex Deymod5664862016-06-28 16:26:00 -070021 #define HAVE_MEMRCHR 1
22+#endif
23
24 /* Define to 1 if you have the MSG_NOSIGNAL flag. */
Alex Deymo16246822017-11-28 14:10:40 +010025+#if !defined(__APPLE__)
Alex Deymod5664862016-06-28 16:26:00 -070026 #define HAVE_MSG_NOSIGNAL 1
27+#endif
28
29 /* Define to 1 if you have the <netdb.h> header file. */
30 #define HAVE_NETDB_H 1
Alex Deymo486467e2017-12-19 19:04:07 +010031@@ -808,9 +815,6 @@
Alex Deymo16246822017-11-28 14:10:40 +010032 /* Define absolute filename for winbind's ntlm_auth helper. */
33 /* #undef NTLM_WB_FILE */
34
35-/* cpu-machine-OS */
36-#define OS "arm-unknown-linux-androideabi"
37-
38 /* Name of package */
39 #define PACKAGE "curl"
40
Alex Deymo486467e2017-12-19 19:04:07 +010041@@ -848,7 +852,7 @@
Alex Deymo16246822017-11-28 14:10:40 +010042 #define RECV_TYPE_ARG4 int
43
44 /* Define to the function return type for recv. */
45-#define RECV_TYPE_RETV int
46+#define RECV_TYPE_RETV ssize_t
47
48 /* Define as the return type of signal handlers (`int' or `void'). */
Alex Deymod5664862016-06-28 16:26:00 -070049 #define RETSIGTYPE void
Alex Deymo486467e2017-12-19 19:04:07 +010050@@ -866,7 +870,7 @@
Alex Deymo16246822017-11-28 14:10:40 +010051 #define SELECT_TYPE_ARG5 struct timeval *
Alex Deymod5664862016-06-28 16:26:00 -070052
Alex Deymo16246822017-11-28 14:10:40 +010053 /* Define to the function return type for select. */
54-#define SELECT_TYPE_RETV int
55+#define SELECT_TYPE_RETV ssize_t
Alex Deymod5664862016-06-28 16:26:00 -070056
Alex Deymo16246822017-11-28 14:10:40 +010057 /* Define to the type qualifier of arg 2 for send. */
58 #define SEND_QUAL_ARG2 const
Alex Deymo486467e2017-12-19 19:04:07 +010059@@ -884,7 +888,7 @@
Alex Deymo16246822017-11-28 14:10:40 +010060 #define SEND_TYPE_ARG4 int
61
Alex Deymod5664862016-06-28 16:26:00 -070062 /* Define to the function return type for send. */
Alex Deymo16246822017-11-28 14:10:40 +010063-#define SEND_TYPE_RETV int
64+#define SEND_TYPE_RETV ssize_t
65
Alex Deymo486467e2017-12-19 19:04:07 +010066 /* The size of `curl_off_t', as computed by sizeof. */
67 #define SIZEOF_CURL_OFF_T 8
68@@ -892,24 +896,9 @@
Alex Deymo16246822017-11-28 14:10:40 +010069 /* The size of `int', as computed by sizeof. */
70 #define SIZEOF_INT 4
Alex Deymod5664862016-06-28 16:26:00 -070071
72-/* The size of `long', as computed by sizeof. */
73-#define SIZEOF_LONG 4
74-
Alex Deymo16246822017-11-28 14:10:40 +010075-/* The size of `long long', as computed by sizeof. */
76-/* #undef SIZEOF_LONG_LONG */
77-
Alex Deymod5664862016-06-28 16:26:00 -070078-/* The size of `off_t', as computed by sizeof. */
79-#define SIZEOF_OFF_T 8
80-
Alex Deymo16246822017-11-28 14:10:40 +010081 /* The size of `short', as computed by sizeof. */
82 #define SIZEOF_SHORT 2
83
84-/* The size of `size_t', as computed by sizeof. */
85-#define SIZEOF_SIZE_T 4
86-
87-/* The size of `time_t', as computed by sizeof. */
88-#define SIZEOF_TIME_T 4
89-
Alex Deymod5664862016-06-28 16:26:00 -070090 /* Define to 1 if you have the ANSI C header files. */
91 #define STDC_HEADERS 1
Alex Deymo16246822017-11-28 14:10:40 +010092