From owner-svn-src-head@FreeBSD.ORG Mon Jul 16 10:08:51 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 647831065670; Mon, 16 Jul 2012 10:08:51 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from mail-n.franken.de (drew.ipv6.franken.de [IPv6:2001:638:a02:a001:20e:cff:fe4a:feaa]) by mx1.freebsd.org (Postfix) with ESMTP id 640A88FC1B; Mon, 16 Jul 2012 10:08:50 +0000 (UTC) Received: from [192.168.1.103] (p5481A29D.dip.t-dialin.net [84.129.162.157]) (Authenticated sender: macmic) by mail-n.franken.de (Postfix) with ESMTP id 98D071C0C0BD4; Mon, 16 Jul 2012 12:08:48 +0200 (CEST) Mime-Version: 1.0 (Apple Message framework v1278) Content-Type: text/plain; charset=iso-8859-1 From: Michael Tuexen In-Reply-To: <5003DC20.9020703@FreeBSD.org> Date: Mon, 16 Jul 2012 12:08:36 +0200 Content-Transfer-Encoding: quoted-printable Message-Id: <476489F5-A114-4DAF-9030-AE35D76EEDD5@FreeBSD.org> References: <201207160643.q6G6h5di011993@svn.freebsd.org> <5003DC20.9020703@FreeBSD.org> To: Doug Barton X-Mailer: Apple Mail (2.1278) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r238514 - head/usr.bin/netstat X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jul 2012 10:08:51 -0000 On Jul 16, 2012, at 11:17 AM, Doug Barton wrote: > Is it my imagination or did this break the build? I think it should have fixed the build, which was broken by r238501. Or am I missing something? Best regards Michael >=20 > On 07/15/2012 23:43, Michael Tuexen wrote: >> Author: tuexen >> Date: Mon Jul 16 06:43:04 2012 >> New Revision: 238514 >> URL: http://svn.freebsd.org/changeset/base/238514 >>=20 >> Log: >> Allow netstat to be build if INET is not defined in the kernel. >> Thanks to Garrett Cooper for reporting the issue. >>=20 >> MFC after: 3 days >> X-MFC: 238501 >>=20 >> Modified: >> head/usr.bin/netstat/Makefile >> head/usr.bin/netstat/sctp.c >>=20 >> Modified: head/usr.bin/netstat/Makefile >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/usr.bin/netstat/Makefile Mon Jul 16 02:10:26 2012 = (r238513) >> +++ head/usr.bin/netstat/Makefile Mon Jul 16 06:43:04 2012 = (r238514) >> @@ -13,6 +13,10 @@ CFLAGS+=3D-fno-strict-aliasing >> CFLAGS+=3D-DIPSEC >> CFLAGS+=3D-DSCTP >>=20 >> +.if ${MK_INET_SUPPORT} !=3D "no" >> +CFLAGS+=3D-DINET >> +.endif >> + >> .if ${MK_INET6_SUPPORT} !=3D "no" >> SRCS+=3D inet6.c >> CFLAGS+=3D-DINET6 >>=20 >> Modified: head/usr.bin/netstat/sctp.c >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- head/usr.bin/netstat/sctp.c Mon Jul 16 02:10:26 2012 = (r238513) >> +++ head/usr.bin/netstat/sctp.c Mon Jul 16 06:43:04 2012 = (r238514) >> @@ -107,6 +107,7 @@ struct xraddr_entry { >> * If numeric_addr has been supplied, give >> * numeric value, otherwise try for symbolic name. >> */ >> +#ifdef INET >> static char * >> inetname(struct in_addr *inp) >> { >> @@ -146,6 +147,7 @@ inetname(struct in_addr *inp) >> } >> return (line); >> } >> +#endif >>=20 >> #ifdef INET6 >> static char ntop_buf[INET6_ADDRSTRLEN]; >> @@ -197,9 +199,11 @@ sctp_print_address(union sctp_sockstore=20 >> int width; >>=20 >> switch (address->sa.sa_family) { >> +#ifdef INET >> case AF_INET: >> sprintf(line, "%.*s.", Wflag ? 39 : 16, = inetname(&address->sin.sin_addr)); >> break; >> +#endif >> #ifdef INET6 >> case AF_INET6: >> sprintf(line, "%.*s.", Wflag ? 39 : 16, = inet6name(&address->sin6.sin6_addr)); >>=20 >=20 >=20 > --=20 >=20 > Change is hard. >=20 >=20 >=20 >=20