From owner-svn-src-stable-10@FreeBSD.ORG  Mon Jul 21 06:45:19 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EEC6A34E;
 Mon, 21 Jul 2014 06:45:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DB6B52B8D;
 Mon, 21 Jul 2014 06:45:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6L6jJuW051923;
 Mon, 21 Jul 2014 06:45:19 GMT (envelope-from cy@svn.freebsd.org)
Received: (from cy@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6L6jJdS051921;
 Mon, 21 Jul 2014 06:45:19 GMT (envelope-from cy@svn.freebsd.org)
Message-Id: <201407210645.s6L6jJdS051921@svn.freebsd.org>
From: Cy Schubert <cy@FreeBSD.org>
Date: Mon, 21 Jul 2014 06:45:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r268937 - in stable/10: contrib/ipfilter/lib
 sys/contrib/ipfilter/netinet
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Jul 2014 06:45:20 -0000

Author: cy
Date: Mon Jul 21 06:45:19 2014
New Revision: 268937
URL: http://svnweb.freebsd.org/changeset/base/268937

Log:
  MFC r268532 and r268585. When world and kernel are built without INET6
  support, the userland was still built with INET6 turned on.
  
  PR:		190964
  Approved by:	glebius (mentor, implicit)

Modified:
  stable/10/contrib/ipfilter/lib/printipfexpr.c
  stable/10/sys/contrib/ipfilter/netinet/ip_compat.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/ipfilter/lib/printipfexpr.c
==============================================================================
--- stable/10/contrib/ipfilter/lib/printipfexpr.c	Mon Jul 21 04:48:02 2014	(r268936)
+++ stable/10/contrib/ipfilter/lib/printipfexpr.c	Mon Jul 21 06:45:19 2014	(r268937)
@@ -3,7 +3,9 @@
 static void printport __P((int *));
 static void printhosts __P((int *));
 static void printsingle __P((int *));
+#ifdef USE_INET6
 static void printhostsv6 __P((int *));
+#endif
 
 void
 printipfexpr(array)

Modified: stable/10/sys/contrib/ipfilter/netinet/ip_compat.h
==============================================================================
--- stable/10/sys/contrib/ipfilter/netinet/ip_compat.h	Mon Jul 21 04:48:02 2014	(r268936)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_compat.h	Mon Jul 21 06:45:19 2014	(r268937)
@@ -33,10 +33,6 @@
 #endif
 
 #define	SOLARIS	(defined(sun) && (defined(__svr4__) || defined(__SVR4)))
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \
-    !defined(_KERNEL) && !defined(USE_INET6) && !defined(NOINET6)
-# define	USE_INET6
-#endif
 
 
 #if defined(__SVR4) || defined(__svr4__) || defined(__sgi)