diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-05-12 00:32:14 +0200 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-05-12 10:46:57 +0200 |
| commit | 7e1c0e75ed6a7833a8a653936b8897f64bd0006d (patch) | |
| tree | c20d5cb0cf4e9f1a1cd786e9ffdb80d21e02704a /deps/cares/include | |
| parent | 36cdc7c8acda2a81a9e38df4978876659dc48bc3 (diff) | |
| download | node-new-7e1c0e75ed6a7833a8a653936b8897f64bd0006d.tar.gz | |
deps: sync with upstream bagder/c-ares@bba4dc5
Fixes: https://github.com/iojs/io.js/issues/1676
PR-URL: https://github.com/iojs/io.js/pull/1678
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Diffstat (limited to 'deps/cares/include')
| -rw-r--r-- | deps/cares/include/ares.h | 51 | ||||
| -rw-r--r-- | deps/cares/include/ares_version.h | 4 |
2 files changed, 3 insertions, 52 deletions
diff --git a/deps/cares/include/ares.h b/deps/cares/include/ares.h index 3091064b51..7233c5acf8 100644 --- a/deps/cares/include/ares.h +++ b/deps/cares/include/ares.h @@ -29,55 +29,8 @@ # define WIN32 #endif -/*************************** libuv patch ***************/ - -/* - * We want to avoid autoconf altogether since there are a finite number of - * operating systems and simply build c-ares. Therefore we do not want the - * configurations provided by ares_build.h since we are always statically - * linking c-ares into libuv. Having a system dependent ares_build.h forces - * all users of ares.h to include the correct ares_build.h. We do not care - * about the linking checks provided by ares_rules.h. This would complicate - * the libuv build process. - */ - - -#if defined(WIN32) -/* Configure process defines this to 1 when it finds out that system */ -/* header file ws2tcpip.h must be included by the external interface. */ -/* #undef CARES_PULL_WS2TCPIP_H */ -# include <winsock2.h> -# include <ws2tcpip.h> -# include <windows.h> - -#else /* Not Windows */ - -# include <sys/time.h> -# include <sys/types.h> -# include <sys/socket.h> -#endif - -#if 0 -/* The size of `long', as computed by sizeof. */ -#define CARES_SIZEOF_LONG 4 -#endif - -/* Integral data type used for ares_socklen_t. */ -#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t - -#if 0 -/* The size of `ares_socklen_t', as computed by sizeof. */ -#define CARES_SIZEOF_ARES_SOCKLEN_T 4 -#endif - /* Data type definition of ares_socklen_t. */ -typedef int ares_socklen_t; - -#if 0 /* libuv disabled */ -#include "ares_rules.h" /* c-ares rules enforcement */ -#endif - -/*********************** end libuv patch ***************/ +typedef unsigned ares_socklen_t; #include <sys/types.h> @@ -520,8 +473,6 @@ struct ares_txt_reply { struct ares_txt_reply *next; unsigned char *txt; size_t length; /* length excludes null termination */ - unsigned char record_start; /* 1 - if start of new record - * 0 - if a chunk in the same record */ }; struct ares_naptr_reply { diff --git a/deps/cares/include/ares_version.h b/deps/cares/include/ares_version.h index cdd49924cc..2c9146d7d9 100644 --- a/deps/cares/include/ares_version.h +++ b/deps/cares/include/ares_version.h @@ -7,11 +7,11 @@ #define ARES_VERSION_MAJOR 1 #define ARES_VERSION_MINOR 10 -#define ARES_VERSION_PATCH 0 +#define ARES_VERSION_PATCH 1 #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\ (ARES_VERSION_MINOR<<8)|\ (ARES_VERSION_PATCH)) -#define ARES_VERSION_STR "1.10.0-DEV" +#define ARES_VERSION_STR "1.10.1-DEV" #if (ARES_VERSION >= 0x010700) # define CARES_HAVE_ARES_LIBRARY_INIT 1 |