diff options
| author | peter <peter@FreeBSD.org> | 1998-03-21 11:34:28 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-03-21 11:34:28 +0000 |
| commit | f3fab3424a9f8b8701ade20bff88558d3750e701 (patch) | |
| tree | 7cbaed64e5a96e273e7b7f290f6d51a98aa3a9f2 /sys/netinet/fil.c | |
| parent | f9b0ed3b4946d1138f76be952463c3b76dd1eb05 (diff) | |
| download | FreeBSD-src-f3fab3424a9f8b8701ade20bff88558d3750e701.zip FreeBSD-src-f3fab3424a9f8b8701ade20bff88558d3750e701.tar.gz | |
Make this compile.. There are some unpleasing hacks in here.
A major unifdef session is sorely tempting but would destroy any remaining
chance of tracking the original sources.
Diffstat (limited to 'sys/netinet/fil.c')
| -rw-r--r-- | sys/netinet/fil.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sys/netinet/fil.c b/sys/netinet/fil.c index 58c28e14..57190a9 100644 --- a/sys/netinet/fil.c +++ b/sys/netinet/fil.c @@ -7,15 +7,19 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-1996 Darren Reed"; -static const char rcsid[] = "@(#)$Id: fil.c,v 2.0.2.41.2.9 1997/12/02 13:56:06 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: fil.c,v 1.1.1.6 1998/03/21 10:11:28 peter Exp $"; #endif +#include "opt_ipfilter.h" + #include <sys/errno.h> #include <sys/types.h> #include <sys/param.h> #include <sys/time.h> #include <sys/file.h> -#include <sys/ioctl.h> +#if !defined(__FreeBSD__) +# include <sys/ioctl.h> +#endif #if (defined(_KERNEL) || defined(KERNEL)) && !defined(linux) # include <sys/systm.h> #else @@ -32,6 +36,9 @@ static const char rcsid[] = "@(#)$Id: fil.c,v 2.0.2.41.2.9 1997/12/02 13:56:06 d # include <sys/dditypes.h> # include <sys/stream.h> #endif +#if defined(__FreeBSD__) +# include <sys/malloc.h> +#endif #ifndef linux # include <sys/protosw.h> # include <sys/socket.h> @@ -1073,7 +1080,7 @@ nodata: * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $Id: fil.c,v 2.0.2.41.2.9 1997/12/02 13:56:06 darrenr Exp $ + * $Id: fil.c,v 1.1.1.6 1998/03/21 10:11:28 peter Exp $ */ /* * Copy data from an mbuf chain starting "off" bytes from the beginning, |
