diff options
| author | Haibo Huang <hhb@google.com> | 2019-01-15 18:20:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-15 18:20:30 +0000 |
| commit | f3b10497acdc22cfd5fa0f93b08a9150e352f2d5 (patch) | |
| tree | 421b037a92a6d5209e8e4c30e8a830c262abe6d4 /local-configure.patch | |
| parent | 98caa6f514b401764e3ac76041ff7e006f109e8c (diff) | |
| parent | 21926d584a5b118cbff81a9fb4329059011f87c6 (diff) | |
| download | external_curl-f3b10497acdc22cfd5fa0f93b08a9150e352f2d5.tar.gz external_curl-f3b10497acdc22cfd5fa0f93b08a9150e352f2d5.tar.bz2 external_curl-f3b10497acdc22cfd5fa0f93b08a9150e352f2d5.zip | |
Merge "Upgrade curl from 7.62.0 to 7.63.0"
Diffstat (limited to 'local-configure.patch')
| -rw-r--r-- | local-configure.patch | 67 |
1 files changed, 38 insertions, 29 deletions
diff --git a/local-configure.patch b/local-configure.patch index 2d1580c7..a52f09d8 100644 --- a/local-configure.patch +++ b/local-configure.patch @@ -1,8 +1,8 @@ -diff --git a/lib/curl_config.h b/lib/curl_config.h -index f9aef69e2..f5ba92735 100644 ---- a/lib/curl_config.h -+++ b/lib/curl_config.h -@@ -473,7 +473,7 @@ +Index: curl/lib/curl_config.h +=================================================================== +--- curl.orig/lib/curl_config.h ++++ curl/lib/curl_config.h +@@ -464,7 +464,7 @@ #define HAVE_NETDB_H 1 /* Define to 1 if you have the <netinet/in6.h> header file. */ @@ -11,7 +11,16 @@ index f9aef69e2..f5ba92735 100644 /* Define to 1 if you have the <netinet/in.h> header file. */ #define HAVE_NETINET_IN_H 1 -@@ -808,9 +815,6 @@ +@@ -495,7 +495,7 @@ + #define HAVE_OPENSSL_RSA_H 1 + + /* if you have the function SRP_Calc_client_key */ +-#define HAVE_OPENSSL_SRP 1 ++/* #undef HAVE_OPENSSL_SRP */ + + /* Define to 1 if you have the <openssl/ssl.h> header file. */ + #define HAVE_OPENSSL_SSL_H 1 +@@ -812,9 +812,6 @@ /* Define absolute filename for winbind's ntlm_auth helper. */ /* #undef NTLM_WB_FILE */ @@ -21,16 +30,7 @@ index f9aef69e2..f5ba92735 100644 /* Name of package */ #define PACKAGE "curl" -@@ -848,7 +852,7 @@ - #define RECV_TYPE_ARG4 int - - /* Define to the function return type for recv. */ --#define RECV_TYPE_RETV int -+#define RECV_TYPE_RETV ssize_t - - /* Define as the return type of signal handlers (`int' or `void'). */ - #define RETSIGTYPE void -@@ -866,7 +870,7 @@ +@@ -870,7 +867,7 @@ #define SELECT_TYPE_ARG5 struct timeval * /* Define to the function return type for select. */ @@ -39,21 +39,12 @@ index f9aef69e2..f5ba92735 100644 /* Define to the type qualifier of arg 2 for send. */ #define SEND_QUAL_ARG2 const -@@ -884,7 +888,7 @@ - #define SEND_TYPE_ARG4 int - - /* Define to the function return type for send. */ --#define SEND_TYPE_RETV int -+#define SEND_TYPE_RETV ssize_t - - /* The number of bytes in type curl_off_t */ - #define SIZEOF_CURL_OFF_T 8 -@@ -892,24 +896,9 @@ +@@ -896,24 +893,9 @@ /* The number of bytes in type int */ #define SIZEOF_INT 4 -/* The number of bytes in type long */ --#define SIZEOF_LONG 4 +-#define SIZEOF_LONG 8 - -/* The number of bytes in type long long */ -/* #undef SIZEOF_LONG_LONG */ @@ -65,11 +56,29 @@ index f9aef69e2..f5ba92735 100644 #define SIZEOF_SHORT 2 -/* The number of bytes in type size_t */ --#define SIZEOF_SIZE_T 4 +-#define SIZEOF_SIZE_T 8 - -/* The number of bytes in type time_t */ --#define SIZEOF_TIME_T 4 +-#define SIZEOF_TIME_T 8 - /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 +@@ -987,7 +969,7 @@ + /* #undef USE_THREADS_WIN32 */ + + /* Use TLS-SRP authentication */ +-#define USE_TLS_SRP 1 ++/* #undef USE_TLS_SRP */ + + /* Use Unix domain sockets */ + #define USE_UNIX_SOCKETS 1 +@@ -1026,7 +1008,7 @@ + #endif + + /* Number of bits in a file offset, on hosts where this is settable. */ +-/* #undef _FILE_OFFSET_BITS */ ++#define _FILE_OFFSET_BITS 64 + + /* Define for large files, on AIX-style hosts. */ + /* #undef _LARGE_FILES */ |