From owner-cvs-all Thu May 25 8:11: 3 2000 Delivered-To: cvs-all@freebsd.org Received: from overcee.netplex.com.au (peter1.yahoo.com [208.48.107.4]) by hub.freebsd.org (Postfix) with ESMTP id 70F3C37C4D3; Thu, 25 May 2000 08:10:44 -0700 (PDT) (envelope-from peter@netplex.com.au) Received: from netplex.com.au (localhost [127.0.0.1]) by overcee.netplex.com.au (Postfix) with ESMTP id E27231CE1; Thu, 25 May 2000 08:10:42 -0700 (PDT) (envelope-from peter@netplex.com.au) X-Mailer: exmh version 2.1.1 10/15/1999 To: "Akinori -Aki- MUSHA" Cc: darrenr@FreeBSD.org, 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 In-Reply-To: Message from "Akinori -Aki- MUSHA" of "Thu, 25 May 2000 23:47:32 +0900." <86k8giy9dn.wl@localhost.local.idaemons.org> Date: Thu, 25 May 2000 08:10:42 -0700 From: Peter Wemm Message-Id: <20000525151042.E27231CE1@overcee.netplex.com.au> Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG "Akinori -Aki- MUSHA" wrote: > At Tue, 23 May 2000 21:40:18 -0700 (PDT), > Darren Reed 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 > +# endif > # if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) > # include "opt_ipfilter.h" > # endif > -# else > -# include > # endif > #endif > #ifdef IPFILTER_LOG > > You can't get __FreeBSD_version before including . Actually, osreldate.h should be killed entirely. It's defined in now: #define __FreeBSD_version 400016 /* Master, propagated to newvers */ #include cannot and never will work. Cheers, -Peter -- Peter Wemm - peter@FreeBSD.org; peter@yahoo-inc.com; peter@netplex.com.au "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message