From 57ee847ce7e07b2744f46be990f887d067c00d44 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 26 Sep 2008 11:21:22 +0000 Subject: Avoid the use of the '? :' operator inside the call to our test-server logging function. It doesn't work on some systems. --- tests/server/resolve.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'tests/server/resolve.c') diff --git a/tests/server/resolve.c b/tests/server/resolve.c index 57edde99b..27723942c 100644 --- a/tests/server/resolve.c +++ b/tests/server/resolve.c @@ -61,7 +61,10 @@ /* include memdebug.h last */ #include "memdebug.h" -static char use_ipv6=FALSE; +#ifdef ENABLE_IPV6 +static bool use_ipv6 = FALSE; +#endif +static const char *ipv_inuse = "IPv4"; const char *serverlogfile=""; /* for a util.c function we don't use */ @@ -84,13 +87,17 @@ int main(int argc, char *argv[]) } else if(!strcmp("--ipv6", argv[arg])) { #ifdef ENABLE_IPV6 - use_ipv6=TRUE; + ipv_inuse = "IPv6"; + use_ipv6 = TRUE; #endif arg++; } else if(!strcmp("--ipv4", argv[arg])) { /* for completeness, we support this option as well */ - use_ipv6=FALSE; +#ifdef ENABLE_IPV6 + ipv_inuse = "IPv4"; + use_ipv6 = FALSE; +#endif arg++; } else { @@ -136,7 +143,7 @@ int main(int argc, char *argv[]) } #endif if(rc) - printf("Resolving IPv%d '%s' didn't work\n", (use_ipv6?6:4), host); + printf("Resolving %s '%s' didn't work\n", ipv_inuse, host); return !rc?0:1; } -- cgit v1.2.3