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.
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
