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_setup.h | |
| 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_setup.h')
| -rw-r--r-- | deps/cares/src/ares_setup.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/deps/cares/src/ares_setup.h b/deps/cares/src/ares_setup.h index dee3e6ba6e..4df796116a 100644 --- a/deps/cares/src/ares_setup.h +++ b/deps/cares/src/ares_setup.h @@ -75,9 +75,6 @@ /* please, do it beyond the point further indicated in this file. */ /* ================================================================ */ -#if 1 -# define SIZEOF_SHORT 2 -#else /* Disabled for the gyp-ified build. */ /* * c-ares external interface definitions are also used internally, * and might also include required system header files to define them. @@ -90,7 +87,6 @@ */ #include <ares_rules.h> -#endif /* ================================================================= */ /* No system header file shall be included in this file before this */ |