From 8b79584e010dbbe67c9a4c9c08fc2d837d0b6c8c Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Mon, 16 Apr 2012 15:33:14 +0200 Subject: Kill some more compiler warnings. --- ares_init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3