mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
curl_setup: fix CURLRES_IPV6
condition
Move the definition of `CURLRES_IPV6` to before undefining
`HAVE_GETADDRINFO`. Regression from commit 67a08dca27
which caused
some tests to fail and others to be skipped with c-ares.
Fixes https://github.com/curl/curl/issues/4673
Closes https://github.com/curl/curl/pull/4677
This commit is contained in:
parent
914975fe6e
commit
bf24e0f928
@ -571,6 +571,12 @@
|
|||||||
* Mutually exclusive CURLRES_* definitions.
|
* Mutually exclusive CURLRES_* definitions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#if defined(ENABLE_IPV6) && defined(HAVE_GETADDRINFO)
|
||||||
|
# define CURLRES_IPV6
|
||||||
|
#else
|
||||||
|
# define CURLRES_IPV4
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef USE_ARES
|
#ifdef USE_ARES
|
||||||
# define CURLRES_ASYNCH
|
# define CURLRES_ASYNCH
|
||||||
# define CURLRES_ARES
|
# define CURLRES_ARES
|
||||||
@ -585,12 +591,6 @@
|
|||||||
# define CURLRES_SYNCH
|
# define CURLRES_SYNCH
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(ENABLE_IPV6) && defined(HAVE_GETADDRINFO)
|
|
||||||
# define CURLRES_IPV6
|
|
||||||
#else
|
|
||||||
# define CURLRES_IPV4
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------- */
|
/* ---------------------------------------------------------------- */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user