1Index: curl/lib/curl_config.h 2=================================================================== 3--- curl.orig/lib/curl_config.h 4+++ curl/lib/curl_config.h 5@@ -478,7 +478,7 @@ 6 #define HAVE_NETDB_H 1 7 8 /* Define to 1 if you have the <netinet/in6.h> header file. */ 9-#define HAVE_NETINET_IN6_H 1 10+/* #undef HAVE_NETINET_IN6_H */ 11 12 /* Define to 1 if you have the <netinet/in.h> header file. */ 13 #define HAVE_NETINET_IN_H 1 14@@ -521,7 +521,7 @@ 15 #define HAVE_OPENSSL_RSA_H 1 16 17 /* if you have the function SRP_Calc_client_key */ 18-#define HAVE_OPENSSL_SRP 1 19+/* #undef HAVE_OPENSSL_SRP */ 20 21 /* Define to 1 if you have the <openssl/ssl.h> header file. */ 22 #define HAVE_OPENSSL_SSL_H 1 23@@ -862,9 +862,6 @@ 24 /* Define absolute filename for winbind's ntlm_auth helper. */ 25 /* #undef NTLM_WB_FILE */ 26 27-/* cpu-machine-OS */ 28-#define OS "arm-unknown-linux-androideabi" 29- 30 /* Name of package */ 31 #define PACKAGE "curl" 32 33@@ -920,7 +917,7 @@ 34 #define SELECT_TYPE_ARG5 struct timeval * 35 36 /* Define to the function return type for select. */ 37-#define SELECT_TYPE_RETV int 38+#define SELECT_TYPE_RETV ssize_t 39 40 /* Define to the type qualifier of arg 2 for send. */ 41 #define SEND_QUAL_ARG2 const 42@@ -946,24 +943,9 @@ 43 /* The number of bytes in type int */ 44 #define SIZEOF_INT 4 45 46-/* The number of bytes in type long */ 47-#define SIZEOF_LONG 8 48- 49-/* The number of bytes in type long long */ 50-/* #undef SIZEOF_LONG_LONG */ 51- 52-/* The number of bytes in type off_t */ 53-#define SIZEOF_OFF_T 8 54- 55 /* The number of bytes in type short */ 56 #define SIZEOF_SHORT 2 57 58-/* The number of bytes in type size_t */ 59-#define SIZEOF_SIZE_T 8 60- 61-/* The number of bytes in type time_t */ 62-#define SIZEOF_TIME_T 8 63- 64 /* Define to 1 if all of the C90 standard headers exist (not just the ones 65 #define STDC_HEADERS 1 66 67@@ -1058,7 +1040,7 @@ 68 /* #undef USE_THREADS_WIN32 */ 69 70 /* Use TLS-SRP authentication */ 71-#define USE_TLS_SRP 1 72+/* #undef USE_TLS_SRP */ 73 74 /* Use Unix domain sockets */ 75 #define USE_UNIX_SOCKETS 1 76@@ -1103,7 +1085,7 @@ 77 #endif 78 79 /* Number of bits in a file offset, on hosts where this is settable. */ 80-/* #undef _FILE_OFFSET_BITS */ 81+#define _FILE_OFFSET_BITS 64 82 83 /* Define for large files, on AIX-style hosts. */ 84 /* #undef _LARGE_FILES */ 85