diff options
| author | cy <cy@FreeBSD.org> | 2014-07-21 06:45:19 +0000 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2014-07-21 06:45:19 +0000 |
| commit | 805537533afcc18873a4bd38daa6d424bd4dc6fe (patch) | |
| tree | 4ed832b141704a75a53c9971daab87c7975aefe1 | |
| parent | 888f6511e321556007cf471f691cb84d9a817237 (diff) | |
| download | FreeBSD-src-805537533afcc18873a4bd38daa6d424bd4dc6fe.zip FreeBSD-src-805537533afcc18873a4bd38daa6d424bd4dc6fe.tar.gz | |
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)
| -rw-r--r-- | contrib/ipfilter/lib/printipfexpr.c | 2 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_compat.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/contrib/ipfilter/lib/printipfexpr.c b/contrib/ipfilter/lib/printipfexpr.c index 64c2f1c..06b987e 100644 --- a/contrib/ipfilter/lib/printipfexpr.c +++ b/contrib/ipfilter/lib/printipfexpr.c @@ -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) diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h index 1d5b5b7..0cd5d5b 100644 --- a/sys/contrib/ipfilter/netinet/ip_compat.h +++ b/sys/contrib/ipfilter/netinet/ip_compat.h @@ -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) |
