svn commit: r268937 - in stable/10: contrib/ipfilter/lib sys/contrib/ipfilter/netinet

[Cy Schubert]

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)