diff options
| -rw-r--r-- | lib/asyn-ares.c | 16 | ||||
| -rw-r--r-- | lib/hostasyn.c | 10 | ||||
| -rw-r--r-- | lib/hostip4.c | 9 | ||||
| -rw-r--r-- | lib/hostip6.c | 10 | ||||
| -rw-r--r-- | lib/hostsyn.c | 10 |
5 files changed, 28 insertions, 27 deletions
diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c index 27523041e..dd7dc4028 100644 --- a/lib/asyn-ares.c +++ b/lib/asyn-ares.c @@ -22,6 +22,14 @@ #include "curl_setup.h" +/*********************************************************************** + * Only for ares-enabled builds + * And only for functions that fulfill the asynch resolver backend API + * as defined in asyn.h, nothing else belongs in this file! + **********************************************************************/ + +#ifdef CURLRES_ARES + #ifdef HAVE_LIMITS_H #include <limits.h> #endif @@ -48,14 +56,6 @@ #define in_addr_t unsigned long #endif -/*********************************************************************** - * Only for ares-enabled builds - * And only for functions that fulfill the asynch resolver backend API - * as defined in asyn.h, nothing else belongs in this file! - **********************************************************************/ - -#ifdef CURLRES_ARES - #include "urldata.h" #include "sendf.h" #include "hostip.h" diff --git a/lib/hostasyn.c b/lib/hostasyn.c index 28bdf7a48..7b6e8568a 100644 --- a/lib/hostasyn.c +++ b/lib/hostasyn.c @@ -22,6 +22,11 @@ #include "curl_setup.h" +/*********************************************************************** + * Only for builds using asynchronous name resolves + **********************************************************************/ +#ifdef CURLRES_ASYNCH + #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif @@ -51,11 +56,6 @@ /* The last #include file should be: */ #include "memdebug.h" -/*********************************************************************** - * Only for builds using asynchronous name resolves - **********************************************************************/ -#ifdef CURLRES_ASYNCH - /* * Curl_addrinfo_callback() gets called by ares, gethostbyname_thread() * or getaddrinfo_thread() when we got the name resolved (or not!). diff --git a/lib/hostip4.c b/lib/hostip4.c index 6a7c6e576..9d6f115ae 100644 --- a/lib/hostip4.c +++ b/lib/hostip4.c @@ -22,6 +22,11 @@ #include "curl_setup.h" +/*********************************************************************** + * Only for plain IPv4 builds + **********************************************************************/ +#ifdef CURLRES_IPV4 /* plain IPv4 code coming up */ + #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif @@ -53,10 +58,6 @@ #include "curl_memory.h" #include "memdebug.h" -/*********************************************************************** - * Only for plain IPv4 builds - **********************************************************************/ -#ifdef CURLRES_IPV4 /* plain IPv4 code coming up */ /* * Curl_ipvalid() checks what CURL_IPRESOLVE_* requirements that might've * been set and returns TRUE if they are OK. diff --git a/lib/hostip6.c b/lib/hostip6.c index edeebec9e..7c9988f41 100644 --- a/lib/hostip6.c +++ b/lib/hostip6.c @@ -22,6 +22,11 @@ #include "curl_setup.h" +/*********************************************************************** + * Only for IPv6-enabled builds + **********************************************************************/ +#ifdef CURLRES_IPV6 + #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif @@ -54,11 +59,6 @@ #include "curl_memory.h" #include "memdebug.h" -/*********************************************************************** - * Only for IPv6-enabled builds - **********************************************************************/ -#ifdef CURLRES_IPV6 - #if defined(CURLDEBUG) && defined(HAVE_GETNAMEINFO) /* These are strictly for memory tracing and are using the same style as the * family otherwise present in memdebug.c. I put these ones here since they diff --git a/lib/hostsyn.c b/lib/hostsyn.c index 1a95263c6..3de6746f5 100644 --- a/lib/hostsyn.c +++ b/lib/hostsyn.c @@ -22,6 +22,11 @@ #include "curl_setup.h" +/*********************************************************************** + * Only for builds using synchronous name resolves + **********************************************************************/ +#ifdef CURLRES_SYNCH + #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif @@ -51,11 +56,6 @@ /* The last #include file should be: */ #include "memdebug.h" -/*********************************************************************** - * Only for builds using synchronous name resolves - **********************************************************************/ -#ifdef CURLRES_SYNCH - /* * Function provided by the resolver backend to set DNS servers to use. */ |