Skip to content

Commit

Permalink
deps: upgrade to c-ares v1.12.0
Browse files Browse the repository at this point in the history
Updated with manual config for Android
Updated with automatic for sunos, *bsd, darwin, linux, aix

PR-URL: #15378
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Ruben Bridgewater <[email protected]>
  • Loading branch information
rvagg authored and BridgeAR committed Oct 2, 2017
1 parent c09c04f commit a9f1254
Show file tree
Hide file tree
Showing 26 changed files with 577 additions and 547 deletions.
15 changes: 15 additions & 0 deletions deps/cares/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# c-ares license

Copyright (c) 2007 - 2016, Daniel Stenberg with many contributors, see AUTHORS
file.

Copyright 1998 by the Massachusetts Institute of Technology.

Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted, provided that
the above copyright notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting documentation, and that
the name of M.I.T. not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior permission.
M.I.T. makes no representations about the suitability of this software for any
purpose. It is provided "as is" without express or implied warranty.
1 change: 1 addition & 0 deletions deps/cares/cares.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
'defines': [ 'CARES_BUILDING_LIBRARY' ]
}],
[ 'OS=="win"', {
'defines': [ 'CARES_PULL_WS2TCPIP_H=1' ],
'include_dirs': [ 'config/win32' ],
'sources': [
'src/config-win32.h',
Expand Down
79 changes: 33 additions & 46 deletions deps/cares/config/aix/ares_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,24 @@
/* when building as static part of libcurl */
/* #undef BUILDING_LIBCURL */

/* when building c-ares library */
/* #undef CARES_BUILDING_LIBRARY */
/* Defined for build that exposes internal static functions for testing. */
/* #undef CARES_EXPOSE_STATICS */

/* when not building a shared library */
/* #undef CARES_STATICLIB */

/* Define to 1 to enable hiding of library internal symbols. */
#define CARES_SYMBOL_HIDING 1
/* Defined for build with symbol hiding. */
/* #undef CARES_SYMBOL_HIDING */

/* Definition to make a library symbol externally visible. */
#define CARES_SYMBOL_SCOPE_EXTERN __attribute__ ((visibility ("default")))
/* #undef CARES_SYMBOL_SCOPE_EXTERN */

/* Use resolver library to configure cares */
/* #undef CARES_USE_LIBRESOLV */

/* if a /etc/inet dir is being used */
/* #undef ETC_INET */

/* Define to the type of arg 2 for gethostname. */
#define GETHOSTNAME_TYPE_ARG2 size_t

/* Define to the type qualifier of arg 1 for getnameinfo. */
#define GETNAMEINFO_QUAL_ARG1 const

Expand Down Expand Up @@ -79,6 +82,9 @@
/* Define to 1 if you have the connect function. */
#define HAVE_CONNECT 1

/* define if the compiler supports basic C++11 syntax */
#define HAVE_CXX11 1

/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1

Expand All @@ -103,6 +109,9 @@
/* Define to 1 if the getaddrinfo function is threadsafe. */
#define HAVE_GETADDRINFO_THREADSAFE 1

/* Define to 1 if you have the getenv function. */
#define HAVE_GETENV 1

/* Define to 1 if you have the gethostbyaddr function. */
#define HAVE_GETHOSTBYADDR 1

Expand All @@ -124,11 +133,8 @@
/* Define to 1 if you have the `if_indextoname' function. */
#define HAVE_IF_INDEXTONAME 1

/* Define to 1 if you have the `inet_net_pton' function. */
#define HAVE_INET_NET_PTON 1

/* Define to 1 if inet_net_pton supports IPv6. */
/* #undef HAVE_INET_NET_PTON_IPV6 */
/* Define to 1 if you have a IPv6 capable working inet_net_pton function. */
/* #undef HAVE_INET_NET_PTON */

/* Define to 1 if you have a IPv6 capable working inet_ntop function. */
#define HAVE_INET_NTOP 1
Expand Down Expand Up @@ -329,13 +335,9 @@
/* Define to 1 if you have the ws2tcpip.h header file. */
/* #undef HAVE_WS2TCPIP_H */

/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"

/* Define to 1 if you are building a native Windows target. */
/* #undef NATIVE_WINDOWS */

/* Define to 1 if you need the malloc.h header file even with stdlib.h */
/* #undef NEED_MALLOC_H */

Expand All @@ -348,23 +350,20 @@
/* Define to 1 if _THREAD_SAFE preprocessor symbol must be defined. */
#define NEED_THREAD_SAFE 1

/* Define to 1 if your C compiler doesn't accept -c and -o together. */
/* #undef NO_MINUS_C_MINUS_O */

/* cpu-machine-OS */
#define OS "rs6000-ibm-aix"
#define OS "powerpc-ibm-aix6.1.9.0"

/* Name of package */
#define PACKAGE "c-ares"

/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "c-ares mailing list => http://cool.haxx.se/mailman/listinfo/c-ares"
#define PACKAGE_BUGREPORT "c-ares mailing list: http://cool.haxx.se/mailman/listinfo/c-ares"

/* Define to the full name of this package. */
#define PACKAGE_NAME "c-ares"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "c-ares 1.7.1"
#define PACKAGE_STRING "c-ares 1.12.0"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "c-ares"
Expand All @@ -373,11 +372,14 @@
#define PACKAGE_URL ""

/* Define to the version of this package. */
#define PACKAGE_VERSION "1.7.1"
#define PACKAGE_VERSION "1.12.0"

/* a suitable file/device to read random data from */
#define RANDOM_FILE "/dev/urandom"

/* Define to the type qualifier pointed by arg 5 for recvfrom. */
#define RECVFROM_QUAL_ARG5

/* Define to the type of arg 1 for recvfrom. */
#define RECVFROM_TYPE_ARG1 int

Expand Down Expand Up @@ -444,24 +446,6 @@
/* Define to the function return type for send. */
#define SEND_TYPE_RETV ssize_t

/* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4

/* The size of `long', as computed by sizeof. */
#define SIZEOF_LONG 4

/* The size of `size_t', as computed by sizeof. */
#define SIZEOF_SIZE_T 4

/* The size of `struct in6_addr', as computed by sizeof. */
#define SIZEOF_STRUCT_IN6_ADDR 16

/* The size of `struct in_addr', as computed by sizeof. */
#define SIZEOF_STRUCT_IN_ADDR 4

/* The size of `time_t', as computed by sizeof. */
#define SIZEOF_TIME_T 4

/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1

Expand All @@ -472,7 +456,7 @@
/* #undef USE_BLOCKING_SOCKETS */

/* Version number of package */
#define VERSION "1.7.1"
#define VERSION "1.12.0"

/* Define to avoid automatic inclusion of winsock.h */
/* #undef WIN32_LEAN_AND_MEAN */
Expand All @@ -494,6 +478,11 @@
# define _ALL_SOURCE 1
#endif

/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
#endif

/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */

Expand All @@ -511,5 +500,3 @@

/* the signed version of size_t */
/* #undef ssize_t */

#define HAVE_GETENV 1
Loading

0 comments on commit a9f1254

Please sign in to comment.