Skip to content

Commit a9f1254

Browse files
rvaggBridgeAR
authored andcommitted
deps: upgrade to c-ares v1.12.0
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]>
1 parent c09c04f commit a9f1254

26 files changed

+577
-547
lines changed

deps/cares/LICENSE.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# c-ares license
2+
3+
Copyright (c) 2007 - 2016, Daniel Stenberg with many contributors, see AUTHORS
4+
file.
5+
6+
Copyright 1998 by the Massachusetts Institute of Technology.
7+
8+
Permission to use, copy, modify, and distribute this software and its
9+
documentation for any purpose and without fee is hereby granted, provided that
10+
the above copyright notice appear in all copies and that both that copyright
11+
notice and this permission notice appear in supporting documentation, and that
12+
the name of M.I.T. not be used in advertising or publicity pertaining to
13+
distribution of the software without specific, written prior permission.
14+
M.I.T. makes no representations about the suitability of this software for any
15+
purpose. It is provided "as is" without express or implied warranty.

deps/cares/cares.gyp

+1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
'defines': [ 'CARES_BUILDING_LIBRARY' ]
112112
}],
113113
[ 'OS=="win"', {
114+
'defines': [ 'CARES_PULL_WS2TCPIP_H=1' ],
114115
'include_dirs': [ 'config/win32' ],
115116
'sources': [
116117
'src/config-win32.h',

deps/cares/config/aix/ares_config.h

+33-46
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,24 @@
1010
/* when building as static part of libcurl */
1111
/* #undef BUILDING_LIBCURL */
1212

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

16-
/* when not building a shared library */
17-
/* #undef CARES_STATICLIB */
18-
19-
/* Define to 1 to enable hiding of library internal symbols. */
20-
#define CARES_SYMBOL_HIDING 1
16+
/* Defined for build with symbol hiding. */
17+
/* #undef CARES_SYMBOL_HIDING */
2118

2219
/* Definition to make a library symbol externally visible. */
23-
#define CARES_SYMBOL_SCOPE_EXTERN __attribute__ ((visibility ("default")))
20+
/* #undef CARES_SYMBOL_SCOPE_EXTERN */
21+
22+
/* Use resolver library to configure cares */
23+
/* #undef CARES_USE_LIBRESOLV */
2424

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

28+
/* Define to the type of arg 2 for gethostname. */
29+
#define GETHOSTNAME_TYPE_ARG2 size_t
30+
2831
/* Define to the type qualifier of arg 1 for getnameinfo. */
2932
#define GETNAMEINFO_QUAL_ARG1 const
3033

@@ -79,6 +82,9 @@
7982
/* Define to 1 if you have the connect function. */
8083
#define HAVE_CONNECT 1
8184

85+
/* define if the compiler supports basic C++11 syntax */
86+
#define HAVE_CXX11 1
87+
8288
/* Define to 1 if you have the <dlfcn.h> header file. */
8389
#define HAVE_DLFCN_H 1
8490

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

112+
/* Define to 1 if you have the getenv function. */
113+
#define HAVE_GETENV 1
114+
106115
/* Define to 1 if you have the gethostbyaddr function. */
107116
#define HAVE_GETHOSTBYADDR 1
108117

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

127-
/* Define to 1 if you have the `inet_net_pton' function. */
128-
#define HAVE_INET_NET_PTON 1
129-
130-
/* Define to 1 if inet_net_pton supports IPv6. */
131-
/* #undef HAVE_INET_NET_PTON_IPV6 */
136+
/* Define to 1 if you have a IPv6 capable working inet_net_pton function. */
137+
/* #undef HAVE_INET_NET_PTON */
132138

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

332-
/* Define to the sub-directory in which libtool stores uninstalled libraries.
333-
*/
338+
/* Define to the sub-directory where libtool stores uninstalled libraries. */
334339
#define LT_OBJDIR ".libs/"
335340

336-
/* Define to 1 if you are building a native Windows target. */
337-
/* #undef NATIVE_WINDOWS */
338-
339341
/* Define to 1 if you need the malloc.h header file even with stdlib.h */
340342
/* #undef NEED_MALLOC_H */
341343

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

351-
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
352-
/* #undef NO_MINUS_C_MINUS_O */
353-
354353
/* cpu-machine-OS */
355-
#define OS "rs6000-ibm-aix"
354+
#define OS "powerpc-ibm-aix6.1.9.0"
356355

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

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

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

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

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

375374
/* Define to the version of this package. */
376-
#define PACKAGE_VERSION "1.7.1"
375+
#define PACKAGE_VERSION "1.12.0"
377376

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

380+
/* Define to the type qualifier pointed by arg 5 for recvfrom. */
381+
#define RECVFROM_QUAL_ARG5
382+
381383
/* Define to the type of arg 1 for recvfrom. */
382384
#define RECVFROM_TYPE_ARG1 int
383385

@@ -444,24 +446,6 @@
444446
/* Define to the function return type for send. */
445447
#define SEND_TYPE_RETV ssize_t
446448

447-
/* The size of `int', as computed by sizeof. */
448-
#define SIZEOF_INT 4
449-
450-
/* The size of `long', as computed by sizeof. */
451-
#define SIZEOF_LONG 4
452-
453-
/* The size of `size_t', as computed by sizeof. */
454-
#define SIZEOF_SIZE_T 4
455-
456-
/* The size of `struct in6_addr', as computed by sizeof. */
457-
#define SIZEOF_STRUCT_IN6_ADDR 16
458-
459-
/* The size of `struct in_addr', as computed by sizeof. */
460-
#define SIZEOF_STRUCT_IN_ADDR 4
461-
462-
/* The size of `time_t', as computed by sizeof. */
463-
#define SIZEOF_TIME_T 4
464-
465449
/* Define to 1 if you have the ANSI C header files. */
466450
#define STDC_HEADERS 1
467451

@@ -472,7 +456,7 @@
472456
/* #undef USE_BLOCKING_SOCKETS */
473457

474458
/* Version number of package */
475-
#define VERSION "1.7.1"
459+
#define VERSION "1.12.0"
476460

477461
/* Define to avoid automatic inclusion of winsock.h */
478462
/* #undef WIN32_LEAN_AND_MEAN */
@@ -494,6 +478,11 @@
494478
# define _ALL_SOURCE 1
495479
#endif
496480

481+
/* Enable large inode numbers on Mac OS X 10.5. */
482+
#ifndef _DARWIN_USE_64_BIT_INODE
483+
# define _DARWIN_USE_64_BIT_INODE 1
484+
#endif
485+
497486
/* Number of bits in a file offset, on hosts where this is settable. */
498487
/* #undef _FILE_OFFSET_BITS */
499488

@@ -511,5 +500,3 @@
511500

512501
/* the signed version of size_t */
513502
/* #undef ssize_t */
514-
515-
#define HAVE_GETENV 1

0 commit comments

Comments
 (0)