[src/trunk]: src/usr.bin/ftp (Hopefully) fix build without IPv6 support

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c78842154bb4
branches:  trunk
changeset: 342222:c78842154bb4
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Dec 13 14:06:13 2015 +0000

description:
(Hopefully) fix build without IPv6 support

diffstat:

 usr.bin/ftp/fetch.c |  8 ++++++--
 usr.bin/ftp/ftp.c   |  8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (72 lines):

diff -r 0fa5f6308f9f -r c78842154bb4 usr.bin/ftp/fetch.c
--- a/usr.bin/ftp/fetch.c       Sun Dec 13 11:51:37 2015 +0000
+++ b/usr.bin/ftp/fetch.c       Sun Dec 13 14:06:13 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fetch.c,v 1.208 2015/12/11 08:37:31 tron Exp $ */
+/*     $NetBSD: fetch.c,v 1.209 2015/12/13 14:06:13 tron Exp $ */
 
 /*-
  * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.208 2015/12/11 08:37:31 tron Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.209 2015/12/13 14:06:13 tron Exp $");
 #endif /* not lint */
 
 /*
@@ -763,13 +763,17 @@
                        }
 
                        if (verbose && res0->ai_next) {
+#ifdef INET6
                                if(res->ai_family == AF_INET6) {
                                        fprintf(ttyout, "Trying [%s]:%s ...\n",
                                            hname, sname);
                                } else {
+#endif
                                        fprintf(ttyout, "Trying %s:%s ...\n",
                                            hname, sname);
+#ifdef INET6
                                }
+#endif
                        }
 
                        s = socket(res->ai_family, SOCK_STREAM,
diff -r 0fa5f6308f9f -r c78842154bb4 usr.bin/ftp/ftp.c
--- a/usr.bin/ftp/ftp.c Sun Dec 13 11:51:37 2015 +0000
+++ b/usr.bin/ftp/ftp.c Sun Dec 13 14:06:13 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftp.c,v 1.165 2015/12/11 08:37:31 tron Exp $   */
+/*     $NetBSD: ftp.c,v 1.166 2015/12/13 14:06:13 tron Exp $   */
 
 /*-
  * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c      8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$NetBSD: ftp.c,v 1.165 2015/12/11 08:37:31 tron Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.166 2015/12/13 14:06:13 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -200,13 +200,17 @@
                }
                if (verbose && res0->ai_next) {
                                /* if we have multiple possibilities */
+#ifdef INET6
                        if(res->ai_family == AF_INET6) {
                                fprintf(ttyout, "Trying [%s]:%s ...\n", hname,
                                    sname);
                        } else {
+#endif
                                fprintf(ttyout, "Trying %s:%s ...\n", hname,
                                    sname);
+#ifdef INET6
                        }
+#endif
                }
                s = socket(res->ai_family, SOCK_STREAM, res->ai_protocol);
                if (s < 0) {