diff options
| author | darrenr <darrenr@FreeBSD.org> | 2000-05-25 16:24:46 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2000-05-25 16:24:46 +0000 |
| commit | f8a289a9a13527f37032e3cb9b395ac7f9e6ffb5 (patch) | |
| tree | 62047234522e014ab1fdbad2d524616f7c842ea7 | |
| parent | e5d7688f99046a4b3022e13701fd346f5328d6d4 (diff) | |
| download | FreeBSD-src-f8a289a9a13527f37032e3cb9b395ac7f9e6ffb5.zip FreeBSD-src-f8a289a9a13527f37032e3cb9b395ac7f9e6ffb5.tar.gz | |
fix up #ifdef jungle for FreeBSD
| -rw-r--r-- | contrib/ipfilter/ip_log.c | 16 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_log.c | 13 | ||||
| -rw-r--r-- | sys/netinet/ip_log.c | 13 |
3 files changed, 29 insertions, 13 deletions
diff --git a/contrib/ipfilter/ip_log.c b/contrib/ipfilter/ip_log.c index ef1af7f..7d6f0b1 100644 --- a/contrib/ipfilter/ip_log.c +++ b/contrib/ipfilter/ip_log.c @@ -5,7 +5,8 @@ * provided that this notice is preserved and due credit is given * to the original author and the contributors. * - * $Id: ip_log.c,v 2.5 2000/03/13 22:10:21 darrenr Exp $ + * $Id: ip_log.c,v 2.1.2.2 1999/09/21 11:55:44 darrenr Exp $ + * $FreeBSD$ */ #include <sys/param.h> #if defined(KERNEL) && !defined(_KERNEL) @@ -15,15 +16,20 @@ # include "opt_ipfilter_log.h" #endif #ifdef __FreeBSD__ -# if defined(_KERNEL) && !defined(IPFILTER_LKM) -# if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) -# include "opt_ipfilter.h" +# if defined(IPFILTER_LKM) || defined(_KERNEL) +# if !defined(__FreeBSD_version) +# include <sys/osreldate.h> +# endif +# if !defined(IPFILTER_LKM) +# if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) +# include "opt_ipfilter.h" +# endif # endif # else # include <osreldate.h> # endif #endif -#ifdef IPFILTER_LOG +#ifdef IPFILTER_LOG # ifndef SOLARIS # define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4))) # endif diff --git a/sys/contrib/ipfilter/netinet/ip_log.c b/sys/contrib/ipfilter/netinet/ip_log.c index 45382a2..7d6f0b1 100644 --- a/sys/contrib/ipfilter/netinet/ip_log.c +++ b/sys/contrib/ipfilter/netinet/ip_log.c @@ -16,15 +16,20 @@ # include "opt_ipfilter_log.h" #endif #ifdef __FreeBSD__ -# if defined(_KERNEL) && !defined(IPFILTER_LKM) -# if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) -# include "opt_ipfilter.h" +# if defined(IPFILTER_LKM) || defined(_KERNEL) +# if !defined(__FreeBSD_version) +# include <sys/osreldate.h> +# endif +# if !defined(IPFILTER_LKM) +# if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) +# include "opt_ipfilter.h" +# endif # endif # else # include <osreldate.h> # endif #endif -#ifdef IPFILTER_LOG +#ifdef IPFILTER_LOG # ifndef SOLARIS # define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4))) # endif diff --git a/sys/netinet/ip_log.c b/sys/netinet/ip_log.c index 45382a2..7d6f0b1 100644 --- a/sys/netinet/ip_log.c +++ b/sys/netinet/ip_log.c @@ -16,15 +16,20 @@ # include "opt_ipfilter_log.h" #endif #ifdef __FreeBSD__ -# if defined(_KERNEL) && !defined(IPFILTER_LKM) -# if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) -# include "opt_ipfilter.h" +# if defined(IPFILTER_LKM) || defined(_KERNEL) +# if !defined(__FreeBSD_version) +# include <sys/osreldate.h> +# endif +# if !defined(IPFILTER_LKM) +# if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) +# include "opt_ipfilter.h" +# endif # endif # else # include <osreldate.h> # endif #endif -#ifdef IPFILTER_LOG +#ifdef IPFILTER_LOG # ifndef SOLARIS # define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4))) # endif |
