moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

resolvers: only include anything if needed 

This avoids warnings about unused stuff.

Closes https://github.com/curl/curl/pull/2023
This commit is contained in:
Marcel Raad 2017-10-26 20:52:22 +02:00
parent 36bbbeb7c2
commit 733190413f
No known key found for this signature in database
GPG Key ID: 33C416EFAE4D6F02
5 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/asyn-ares.c
View File

@ -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"

10
lib/hostasyn.c
View File

@ -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!).

9
lib/hostip4.c
View File

@ -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.

10
lib/hostip6.c
View File

@ -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

10
lib/hostsyn.c
View File

@ -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.
*/