Date: Thu, 25 May 2000 23:47:32 +0900 From: "Akinori -Aki- MUSHA" <knu@idaemons.org> To: darrenr@FreeBSD.org Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/netinet fil.c ip_auth.c ip_compat.h ip_ftp_pxy.c ip_log.c ip_nat.c ip_nat.h ip_raudio_pxy.c ip_rcmd_pxy.c ipl.h mlfk_ipl.c Message-ID: <86k8giy9dn.wl@localhost.local.idaemons.org> In-Reply-To: In your message of "Tue, 23 May 2000 21:40:18 -0700 (PDT)" <200005240440.VAA28818@freefall.freebsd.org> References: <200005240440.VAA28818@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
At Tue, 23 May 2000 21:40:18 -0700 (PDT),
Darren Reed <darrenr@FreeBSD.org> wrote:
> 1.14 +14 -13 src/sys/netinet/ip_log.c
Part of this commit should be backed out.
--- src/sys/netinet/ip_log.c.orig Thu May 25 17:55:43 2000
+++ src/sys/netinet/ip_log.c Thu May 25 23:39:33 2000
@@ -17,11 +17,12 @@
#endif
#ifdef __FreeBSD__
# if defined(_KERNEL) && !defined(IPFILTER_LKM)
+# if !defined(__FreeBSD_version)
+# include <sys/osreldate.h>
+# endif
# if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
# include "opt_ipfilter.h"
# endif
-# else
-# include <osreldate.h>
# endif
#endif
#ifdef IPFILTER_LOG
You can't get __FreeBSD_version before including <osreldate.h>.
Please commit this to unbreak the kernel module.
--
/
/__ __
/ ) ) ) ) /
Akinori -Aki- MUSHA aka / (_ / ( (__( @ idaemons.org / FreeBSD.org
"We're only at home when we're on the run, on the wing, on the fly"
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86k8giy9dn.wl>