[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 91/151: curl_setup: fix `CURLRES_IPV6` condition
From: |
gnunet |
Subject: |
[gnurl] 91/151: curl_setup: fix `CURLRES_IPV6` condition |
Date: |
Fri, 20 Dec 2019 14:26:40 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit bf24e0f9286cf5f24ccfef7f824d1597ffb6ab72
Author: Marcel Raad <address@hidden>
AuthorDate: Thu Dec 5 14:13:46 2019 +0100
curl_setup: fix `CURLRES_IPV6` condition
Move the definition of `CURLRES_IPV6` to before undefining
`HAVE_GETADDRINFO`. Regression from commit 67a08dca27a 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
---
lib/curl_setup.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 5d6e8d6f7..4ecda6a9b 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -571,6 +571,12 @@
* Mutually exclusive CURLRES_* definitions.
*/
+#if defined(ENABLE_IPV6) && defined(HAVE_GETADDRINFO)
+# define CURLRES_IPV6
+#else
+# define CURLRES_IPV4
+#endif
+
#ifdef USE_ARES
# define CURLRES_ASYNCH
# define CURLRES_ARES
@@ -585,12 +591,6 @@
# define CURLRES_SYNCH
#endif
-#if defined(ENABLE_IPV6) && defined(HAVE_GETADDRINFO)
-# define CURLRES_IPV6
-#else
-# define CURLRES_IPV4
-#endif
-
/* ---------------------------------------------------------------- */
/*
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 62/151: curl: two new command line options for etags, (continued)
- [gnurl] 62/151: curl: two new command line options for etags, gnunet, 2019/12/20
- [gnurl] 70/151: global_init: undo the "intialized" bump in case of failure, gnunet, 2019/12/20
- [gnurl] 67/151: sha256: bump the copyright year range, gnunet, 2019/12/20
- [gnurl] 50/151: multi: add curl_multi_wakeup(), gnunet, 2019/12/20
- [gnurl] 69/151: parsedate: offer a getdate_capped() alternative, gnunet, 2019/12/20
- [gnurl] 52/151: TLS: add BearSSL vtls implementation, gnunet, 2019/12/20
- [gnurl] 86/151: hostip4.c: bump copyright year range, gnunet, 2019/12/20
- [gnurl] 75/151: docs: add "added: 7.68.0" to the --etag-* docs, gnunet, 2019/12/20
- [gnurl] 81/151: openssl: set X509_V_FLAG_PARTIAL_CHAIN, gnunet, 2019/12/20
- [gnurl] 78/151: travis: do not use OVERRIDE_CC or OVERRIDE_CXX if empty, gnunet, 2019/12/20
- [gnurl] 91/151: curl_setup: fix `CURLRES_IPV6` condition,
gnunet <=
- [gnurl] 71/151: strerror: Add Curl_winapi_strerror for Win API specific errors, gnunet, 2019/12/20
- [gnurl] 72/151: openssl: retrieve reported LibreSSL version at runtime, gnunet, 2019/12/20
- [gnurl] 74/151: copyright: fix the year ranges for two files, gnunet, 2019/12/20
- [gnurl] 68/151: docs: add more references to curl_multi_poll, gnunet, 2019/12/20
- [gnurl] 76/151: Azure Pipelines: initial CI setup, gnunet, 2019/12/20
- [gnurl] 97/151: mailmap: Mohammad Hasbini, gnunet, 2019/12/20
- [gnurl] 106/151: tests: make it possible to set executable extensions, gnunet, 2019/12/20
- [gnurl] 92/151: etag: allow both --etag-compare and --etag-save in same cmdline, gnunet, 2019/12/20
- [gnurl] 95/151: RELEASE-NOTES: synced, gnunet, 2019/12/20
- [gnurl] 104/151: tests: use \r\n for log messages in WSL, gnunet, 2019/12/20