From: Daniel Stenberg Date: Wed, 8 Jan 2014 08:41:02 +0000 (+0100) Subject: trynextip: fix build for non-IPV6 capable systems X-Git-Tag: curl-7_35_0~87 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d435c7;p=curl trynextip: fix build for non-IPV6 capable systems AF_INET6 may not exist then Patched-by: Iida Yosiaki Bug: http://curl.haxx.se/bug/view.cgi?id=1322 --- diff --git a/lib/connect.c b/lib/connect.c index 33f7aec3d..05666ebb6 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2014, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -556,7 +556,11 @@ static CURLcode trynextip(struct connectdata *conn, else { /* happy eyeballs - try the other protocol family */ int firstfamily = conn->tempaddr[0]->ai_family; +#ifdef ENABLE_IPV6 family = (firstfamily == AF_INET) ? AF_INET6 : AF_INET; +#else + family = firstfamily; +#endif ai = conn->tempaddr[0]->ai_next; }