From 3a25b174aa5451311002247c31a7aa9a461b63b6 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Wed, 24 Oct 2018 16:49:04 +0200 Subject: deps: upgrade to c-ares v1.15.0 Our out-of-tree patch from 2b6bb9f588 ("deps: c-ares float, win ipv6 bad fec0 prefix") should no longer be necessary, c-ares now blacklists such addresses itself. PR-URL: https://github.com/nodejs/node/pull/23854 Reviewed-By: Refael Ackermann Reviewed-By: Colin Ihrig --- deps/cares/include/ares.h | 2 ++ deps/cares/include/ares_build.h | 12 +++++------- deps/cares/include/ares_rules.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'deps/cares/include') diff --git a/deps/cares/include/ares.h b/deps/cares/include/ares.h index 65a82cb5b7..06f60b3330 100644 --- a/deps/cares/include/ares.h +++ b/deps/cares/include/ares.h @@ -164,6 +164,7 @@ extern "C" { #define ARES_OPT_ROTATE (1 << 14) #define ARES_OPT_EDNSPSZ (1 << 15) #define ARES_OPT_NOROTATE (1 << 16) +#define ARES_OPT_RESOLVCONF (1 << 17) /* Nameinfo flag values */ #define ARES_NI_NOFQDN (1 << 0) @@ -270,6 +271,7 @@ struct ares_options { struct apattern *sortlist; int nsort; int ednspsz; + char *resolvconf_path; }; struct hostent; diff --git a/deps/cares/include/ares_build.h b/deps/cares/include/ares_build.h index f5535b3849..5e3ba9f0d8 100644 --- a/deps/cares/include/ares_build.h +++ b/deps/cares/include/ares_build.h @@ -194,16 +194,14 @@ /* Data type definition of ares_ssize_t. */ #ifdef _WIN32 # ifdef _WIN64 - typedef __int64 ares_ssize_t; +# define CARES_TYPEOF_ARES_SSIZE_T __int64 # else - typedef long ares_ssize_t; +# define CARES_TYPEOF_ARES_SSIZE_T long # endif #else -# ifdef CARES_TYPEOF_ARES_SSIZE_T - typedef CARES_TYPEOF_ARES_SSIZE_T ares_ssize_t; -# else - typedef ssize_t ares_ssize_t; -# endif +# define CARES_TYPEOF_ARES_SSIZE_T ssize_t #endif +typedef CARES_TYPEOF_ARES_SSIZE_T ares_ssize_t; + #endif /* __CARES_BUILD_H */ diff --git a/deps/cares/include/ares_rules.h b/deps/cares/include/ares_rules.h index e617fdc6da..cac23cf2e3 100644 --- a/deps/cares/include/ares_rules.h +++ b/deps/cares/include/ares_rules.h @@ -83,7 +83,7 @@ /* * Verify that the size previously defined and expected for - * ares_socklen_t is actually the the same as the one reported + * ares_socklen_t is actually the same as the one reported * by sizeof() at compile time. */ -- cgit v1.2.3