summaryrefslogtreecommitdiff
path: root/ares_init.c
diff options
context:
space:
mode:
authorGuenter Knauf <lists@gknw.net>2012-04-16 15:33:14 +0200
committerGuenter Knauf <lists@gknw.net>2012-04-16 15:33:14 +0200
commit8b79584e010dbbe67c9a4c9c08fc2d837d0b6c8c (patch)
treed1137841996617b262246bed819fe5564a2cece6 /ares_init.c
parent27a478c7a321fe26e82e2117b324bca044499de6 (diff)
downloadc-ares-8b79584e010dbbe67c9a4c9c08fc2d837d0b6c8c.tar.gz
c-ares-8b79584e010dbbe67c9a4c9c08fc2d837d0b6c8c.tar.bz2
c-ares-8b79584e010dbbe67c9a4c9c08fc2d837d0b6c8c.zip
Kill some more compiler warnings.
Diffstat (limited to 'ares_init.c')
-rw-r--r--ares_init.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ares_init.c b/ares_init.c
index 07e1682..5af9609 100644
--- a/ares_init.c
+++ b/ares_init.c
@@ -97,6 +97,7 @@ static int sortlist_alloc(struct apattern **sortlist, int *nsort,
struct apattern *pat);
static int ip_addr(const char *s, ssize_t len, struct in_addr *addr);
static void natural_mask(struct apattern *pat);
+#if !defined(ANDROID) && !defined(__ANDROID__)
static int config_domain(ares_channel channel, char *str);
static int config_lookup(ares_channel channel, const char *str,
const char *bindch, const char *filech);
@@ -104,6 +105,7 @@ static int config_sortlist(struct apattern **sortlist, int *nsort,
const char *str);
static char *try_config(char *s, const char *opt, char scc);
#endif
+#endif
#define ARES_CONFIG_CHECK(x) (x->lookups && x->nsort > -1 && \
x->nservers > -1 && \
@@ -797,7 +799,7 @@ quit:
static int init_by_resolv_conf(ares_channel channel)
{
-#if !(defined(ANDROID) || defined(__ANDROID__) || defined(WATT32))
+#if !defined(ANDROID) && !defined(__ANDROID__) && !defined(WATT32)
char *line = NULL;
#endif
int status = -1, nservers = 0, nsort = 0;