diff options
| author | Rod Vagg <rod@vagg.org> | 2017-09-13 12:51:23 +1000 |
|---|---|---|
| committer | Ruben Bridgewater <ruben@bridgewater.de> | 2017-10-02 01:16:11 -0300 |
| commit | 13c74706ef872aa9ed5f17572b6466ce5af26b95 (patch) | |
| tree | d096cf59846bb0941c564f3d462b7adc17f10fb8 /deps/cares/src/config-win32.h | |
| parent | d0d1eba872f4b6165af4c39fb2f044de27695c48 (diff) | |
| download | android-node-v8-13c74706ef872aa9ed5f17572b6466ce5af26b95.tar.gz android-node-v8-13c74706ef872aa9ed5f17572b6466ce5af26b95.tar.bz2 android-node-v8-13c74706ef872aa9ed5f17572b6466ce5af26b95.zip | |
deps: upgrade to c-ares v1.13.0
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/config-win32.h')
| -rw-r--r-- | deps/cares/src/config-win32.h | 42 |
1 files changed, 8 insertions, 34 deletions
diff --git a/deps/cares/src/config-win32.h b/deps/cares/src/config-win32.h index dd955252bd..cc8e4430a4 100644 --- a/deps/cares/src/config-win32.h +++ b/deps/cares/src/config-win32.h @@ -216,20 +216,6 @@ #define HAVE_BOOL_T #endif -/* Define if ssize_t is not an available 'typedefed' type. */ -#ifndef _SSIZE_T_DEFINED -# if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || \ - defined(__POCC__) || \ - defined(__MINGW32__) -# elif defined(_WIN64) -# define _SSIZE_T_DEFINED -# define ssize_t __int64 -# else -# define _SSIZE_T_DEFINED -# define ssize_t int -# endif -#endif - /* ---------------------------------------------------------------- */ /* TYPE SIZES */ /* ---------------------------------------------------------------- */ @@ -259,31 +245,19 @@ # define _CRT_NONSTDC_NO_DEPRECATE 1 #endif -/* Officially, Microsoft's Windows SDK versions 6.X do not support Windows - 2000 as a supported build target. VS2008 default installations provide - an embedded Windows SDK v6.0A along with the claim that Windows 2000 is - a valid build target for VS2008. Popular belief is that binaries built - with VS2008 using Windows SDK versions 6.X and Windows 2000 as a build - target are functional. */ -#if defined(_MSC_VER) && (_MSC_VER >= 1500) -# define VS2008_MIN_TARGET 0x0500 -#endif - -/* When no build target is specified VS2008 default build target is Windows - Vista, which leaves out even Winsows XP. If no build target has been given - for VS2008 we will target the minimum Officially supported build target, - which happens to be Windows XP. */ +/* Set the Target to Vista. However, any symbols required above Win2000 + * should be loaded via LoadLibrary() */ #if defined(_MSC_VER) && (_MSC_VER >= 1500) -# define VS2008_DEF_TARGET 0x0501 +# define VS2008_MIN_TARGET 0x0600 #endif /* VS2008 default target settings and minimum build target check. */ #if defined(_MSC_VER) && (_MSC_VER >= 1500) # ifndef _WIN32_WINNT -# define _WIN32_WINNT VS2008_DEF_TARGET +# define _WIN32_WINNT VS2008_MIN_TARGET # endif # ifndef WINVER -# define WINVER VS2008_DEF_TARGET +# define WINVER VS2008_MIN_TARGET # endif # if (_WIN32_WINNT < VS2008_MIN_TARGET) || (WINVER < VS2008_MIN_TARGET) # error VS2008 does not support Windows build targets prior to Windows 2000 @@ -291,13 +265,13 @@ #endif /* When no build target is specified Pelles C 5.00 and later default build - target is Windows Vista. We override default target to be Windows 2000. */ + target is Windows Vista. */ #if defined(__POCC__) && (__POCC__ >= 500) # ifndef _WIN32_WINNT -# define _WIN32_WINNT 0x0500 +# define _WIN32_WINNT 0x0600 # endif # ifndef WINVER -# define WINVER 0x0500 +# define WINVER 0x0600 # endif #endif |