diff options
| author | thegeorg <thegeorg@yandex-team.ru> | 2022-04-10 22:05:11 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.ru> | 2022-04-10 22:05:11 +0300 |
| commit | 8510e25e71604176463c7076033a4350c1226215 (patch) | |
| tree | b794f9c277f28034dbfdf3f6f55833ef1cb0adba /contrib/libs | |
| parent | 54da1f42e3ac3cc41c3b1102d009e3d25d95ceb0 (diff) | |
| download | ydb-8510e25e71604176463c7076033a4350c1226215.tar.gz | |
Remove unnecessary patches from curl
ref:779335552bd6c48b3d9a1c3928b50bd17418d7e2
Diffstat (limited to 'contrib/libs')
| -rw-r--r-- | contrib/libs/curl/include/curl/curl.h | 2 | ||||
| -rw-r--r-- | contrib/libs/curl/lib/if2ip.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/contrib/libs/curl/include/curl/curl.h b/contrib/libs/curl/include/curl/curl.h index 8bd8982c43..521c254e77 100644 --- a/contrib/libs/curl/include/curl/curl.h +++ b/contrib/libs/curl/include/curl/curl.h @@ -59,7 +59,7 @@ #include <time.h> #if defined(CURL_WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) -#if !(defined(_WINSOCK_H) || \ +#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || \ defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H)) /* The check above prevents the winsock2 inclusion if winsock.h already was included, since they can't co-exist without problems */ diff --git a/contrib/libs/curl/lib/if2ip.c b/contrib/libs/curl/lib/if2ip.c index bf397aad45..21e00b1f16 100644 --- a/contrib/libs/curl/lib/if2ip.c +++ b/contrib/libs/curl/lib/if2ip.c @@ -43,6 +43,9 @@ #ifdef HAVE_IFADDRS_H # include <ifaddrs.h> #endif +#ifdef HAVE_STROPTS_H +# include <stropts.h> +#endif #ifdef __VMS # include <inet.h> #endif |