From owner-cvs-all Thu May 25 7:48:14 2000 Delivered-To: cvs-all@freebsd.org Received: from ms.tokyo.jcom.ne.jp (ms.tokyo.jcom.ne.jp [210.234.123.18]) by hub.freebsd.org (Postfix) with ESMTP id 56BA137C33F; Thu, 25 May 2000 07:48:08 -0700 (PDT) (envelope-from knu@idaemons.org) Received: from daemon.local.idaemons.org (203-165-77-40.sugnm1.kt.home.ne.jp [203.165.77.40]) by ms.tokyo.jcom.ne.jp (8.9.3/3.7W 04/27/00) with ESMTP id XAA16422; Thu, 25 May 2000 23:48:05 +0900 (JST) Received: by daemon.local.idaemons.org (8.9.3/3.7W) id XAA52192; Thu, 25 May 2000 23:47:33 +0900 (JST) Date: Thu, 25 May 2000 23:47:32 +0900 Message-ID: <86k8giy9dn.wl@localhost.local.idaemons.org> From: "Akinori -Aki- MUSHA" 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 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> User-Agent: Wanderlust/1.1.2 (Raspberry Beret) EMIKO/1.13.12 (Euglena sociabilis) FLIM/1.13.2 (Kasanui) APEL/10.2 MULE XEmacs/21.1 (patch 9) (Canyonlands) (i386--freebsd) Organization: Associated I. Daemons X-PGP-Public-Key: finger knu@FreeBSD.org X-PGP-Fingerprint: 1BEF D9B2 BABD 25D7 659A FD08 89C2 F3BE E981 4E16 MIME-Version: 1.0 (generated by EMIKO 1.13.12 - "Euglena sociabilis") Content-Type: text/plain; charset=US-ASCII Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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 . 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