diff options
| author | Rod Vagg <rod@vagg.org> | 2016-10-28 14:40:47 +1100 |
|---|---|---|
| committer | Ruben Bridgewater <ruben@bridgewater.de> | 2017-10-02 01:16:06 -0300 |
| commit | a9f125449e61457cbbad79fbae766b603b861d1b (patch) | |
| tree | 2d41cd0419590560a5c690d95dacb4a4e82ab9a4 /deps/cares/src/ares_nowarn.c | |
| parent | c09c04fc5ccae787e1a6aaa30468bb9bd552f528 (diff) | |
| download | android-node-v8-a9f125449e61457cbbad79fbae766b603b861d1b.tar.gz android-node-v8-a9f125449e61457cbbad79fbae766b603b861d1b.tar.bz2 android-node-v8-a9f125449e61457cbbad79fbae766b603b861d1b.zip | |
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: https://github.com/nodejs/node/pull/15378
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'deps/cares/src/ares_nowarn.c')
| -rw-r--r-- | deps/cares/src/ares_nowarn.c | 46 |
1 files changed, 13 insertions, 33 deletions
diff --git a/deps/cares/src/ares_nowarn.c b/deps/cares/src/ares_nowarn.c index d4bd272c6d..7f9035c1a1 100644 --- a/deps/cares/src/ares_nowarn.c +++ b/deps/cares/src/ares_nowarn.c @@ -40,42 +40,22 @@ #include "ares_nowarn.h" -#if (SIZEOF_SHORT == 2) +#ifndef HAVE_LIMITS_H +/* systems without <limits.h> we guess have 16 bit shorts, 32bit ints and + 32bit longs */ # define CARES_MASK_SSHORT 0x7FFF # define CARES_MASK_USHORT 0xFFFF -#elif (SIZEOF_SHORT == 4) -# define CARES_MASK_SSHORT 0x7FFFFFFF -# define CARES_MASK_USHORT 0xFFFFFFFF -#elif (SIZEOF_SHORT == 8) -# define CARES_MASK_SSHORT 0x7FFFFFFFFFFFFFFF -# define CARES_MASK_USHORT 0xFFFFFFFFFFFFFFFF -#else -# error "SIZEOF_SHORT not defined" -#endif - -#if (SIZEOF_INT == 2) -# define CARES_MASK_SINT 0x7FFF -# define CARES_MASK_UINT 0xFFFF -#elif (SIZEOF_INT == 4) -# define CARES_MASK_SINT 0x7FFFFFFF -# define CARES_MASK_UINT 0xFFFFFFFF -#elif (SIZEOF_INT == 8) -# define CARES_MASK_SINT 0x7FFFFFFFFFFFFFFF -# define CARES_MASK_UINT 0xFFFFFFFFFFFFFFFF -#elif (SIZEOF_INT == 16) -# define CARES_MASK_SINT 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -# define CARES_MASK_UINT 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -#else -# error "SIZEOF_INT not defined" -#endif - -#ifndef HAVE_LIMITS_H -/* systems without <limits.h> we guess have 32 bit longs */ -#define CARES_MASK_SLONG 0x7FFFFFFFL -#define CARES_MASK_ULONG 0xFFFFFFFFUL +# define CARES_MASK_SINT 0x7FFFFFFF +# define CARES_MASK_UINT 0xFFFFFFFF +# define CARES_MASK_SLONG 0x7FFFFFFFL +# define CARES_MASK_ULONG 0xFFFFFFFFUL #else -#define CARES_MASK_ULONG ULONG_MAX -#define CARES_MASK_SLONG LONG_MAX +# define CARES_MASK_SSHORT SHRT_MAX +# define CARES_MASK_USHORT USHRT_MAX +# define CARES_MASK_SINT INT_MAX +# define CARES_MASK_UINT UINT_MAX +# define CARES_MASK_SLONG LONG_MAX +# define CARES_MASK_ULONG ULONG_MAX #endif /* |