From owner-svn-src-all@FreeBSD.ORG  Mon Jul 16 09:17:21 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35])
	by hub.freebsd.org (Postfix) with ESMTP id 24DD31065677;
	Mon, 16 Jul 2012 09:17:21 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from opti.dougb.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36])
	by mx2.freebsd.org (Postfix) with ESMTP id 96A5E150A87;
	Mon, 16 Jul 2012 09:17:20 +0000 (UTC)
Message-ID: <5003DC20.9020703@FreeBSD.org>
Date: Mon, 16 Jul 2012 02:17:20 -0700
From: Doug Barton <dougb@FreeBSD.org>
Organization: http://SupersetSolutions.com/
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
	rv:13.0) Gecko/20120621 Thunderbird/13.0.1
MIME-Version: 1.0
To: Michael Tuexen <tuexen@FreeBSD.org>
References: <201207160643.q6G6h5di011993@svn.freebsd.org>
In-Reply-To: <201207160643.q6G6h5di011993@svn.freebsd.org>
X-Enigmail-Version: 1.4.2
OpenPGP: id=1A1ABC84
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
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-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jul 2012 09:17:21 -0000

Is it my imagination or did this break the build?

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
> 
> Log:
>   Allow netstat to be build if INET is not defined in the kernel.
>   Thanks to Garrett Cooper for reporting the issue.
>   
>   MFC after: 3 days
>   X-MFC: 238501
> 
> Modified:
>   head/usr.bin/netstat/Makefile
>   head/usr.bin/netstat/sctp.c
> 
> Modified: head/usr.bin/netstat/Makefile
> ==============================================================================
> --- 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+=-fno-strict-aliasing
>  CFLAGS+=-DIPSEC
>  CFLAGS+=-DSCTP
>  
> +.if ${MK_INET_SUPPORT} != "no"
> +CFLAGS+=-DINET
> +.endif
> +
>  .if ${MK_INET6_SUPPORT} != "no"
>  SRCS+=	inet6.c
>  CFLAGS+=-DINET6
> 
> Modified: head/usr.bin/netstat/sctp.c
> ==============================================================================
> --- 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
>  
>  #ifdef INET6
>  static char ntop_buf[INET6_ADDRSTRLEN];
> @@ -197,9 +199,11 @@ sctp_print_address(union sctp_sockstore 
>  	int width;
>  
>  	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));
> 


-- 

    Change is hard.