diff options
| author | Haibo Huang <hhb@google.com> | 2020-04-30 00:26:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-30 00:26:54 +0000 |
| commit | ea155d05e764c6543c0d6be01edf12dda123ed99 (patch) | |
| tree | e932df98deeb78b7fe8615fe094739eda91b8956 /local-configure.patch | |
| parent | 1277ffb01bf5f3327aa116c213a6fe190a408b1e (diff) | |
| parent | 47cd0cac1b98915c5ee7cc233cde24697a27b6f7 (diff) | |
| download | external_curl-ea155d05e764c6543c0d6be01edf12dda123ed99.tar.gz external_curl-ea155d05e764c6543c0d6be01edf12dda123ed99.tar.bz2 external_curl-ea155d05e764c6543c0d6be01edf12dda123ed99.zip | |
Merge "Upgrade curl to curl-7_70_0" am: 47cd0cac1b
Change-Id: I4a2e70b32534e8f32bc9a29a3b2ea09009bb1233
Diffstat (limited to 'local-configure.patch')
| -rw-r--r-- | local-configure.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/local-configure.patch b/local-configure.patch index 08ef4376..8086e13a 100644 --- a/local-configure.patch +++ b/local-configure.patch @@ -2,7 +2,7 @@ Index: curl/lib/curl_config.h =================================================================== --- curl.orig/lib/curl_config.h +++ curl/lib/curl_config.h -@@ -476,7 +476,7 @@ +@@ -469,7 +469,7 @@ #define HAVE_NETDB_H 1 /* Define to 1 if you have the <netinet/in6.h> header file. */ @@ -11,7 +11,7 @@ Index: curl/lib/curl_config.h /* Define to 1 if you have the <netinet/in.h> header file. */ #define HAVE_NETINET_IN_H 1 -@@ -516,7 +516,7 @@ +@@ -512,7 +512,7 @@ #define HAVE_OPENSSL_RSA_H 1 /* if you have the function SRP_Calc_client_key */ @@ -20,7 +20,7 @@ Index: curl/lib/curl_config.h /* Define to 1 if you have the <openssl/ssl.h> header file. */ #define HAVE_OPENSSL_SSL_H 1 -@@ -842,9 +842,6 @@ +@@ -838,9 +838,6 @@ /* Define absolute filename for winbind's ntlm_auth helper. */ /* #undef NTLM_WB_FILE */ @@ -30,7 +30,7 @@ Index: curl/lib/curl_config.h /* Name of package */ #define PACKAGE "curl" -@@ -900,7 +897,7 @@ +@@ -896,7 +893,7 @@ #define SELECT_TYPE_ARG5 struct timeval * /* Define to the function return type for select. */ @@ -39,7 +39,7 @@ Index: curl/lib/curl_config.h /* Define to the type qualifier of arg 2 for send. */ #define SEND_QUAL_ARG2 const -@@ -926,24 +923,9 @@ +@@ -922,24 +919,9 @@ /* The number of bytes in type int */ #define SIZEOF_INT 4 @@ -64,7 +64,7 @@ Index: curl/lib/curl_config.h /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -@@ -1035,7 +1017,7 @@ +@@ -1034,7 +1016,7 @@ /* #undef USE_THREADS_WIN32 */ /* Use TLS-SRP authentication */ @@ -73,7 +73,7 @@ Index: curl/lib/curl_config.h /* Use Unix domain sockets */ #define USE_UNIX_SOCKETS 1 -@@ -1080,7 +1062,7 @@ +@@ -1079,7 +1061,7 @@ #endif /* Number of bits in a file offset, on hosts where this is settable. */ |