system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-23 10:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

ip_fil.h has 9 separate declarations of iplioctl() in a disgusting

Browse source 
ifdef tangle.  The previous commit to ip_fil.h didn't change the
one that actually applies to the current FreeBSD kernel, of course.
Fixed.

Fixed style bugs in previous commit to ip_fil.h.
This commit is contained in:
Bruce Evans 1998-06-08 06:04:12 +00:00
parent 5a41edb419
commit 42ef2606c3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=36752
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/netinet/ip_fil.c
View file

@ -7,7 +7,7 @@
*/
#if !defined(lint)
static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-1995 Darren Reed";
static const char rcsid[] = "@(#)$Id: ip_fil.c,v 1.2 1998/03/21 11:34:02 peter Exp $";
static const char rcsid[] = "@(#)$Id: ip_fil.c,v 1.3 1998/03/27 18:03:13 peter Exp $";
#endif
#include "opt_ipfilter.h"
@ -342,7 +342,8 @@ struct proc *p;
)
#endif
dev_t dev;
#if defined(__NetBSD__) || defined(__OpenBSD__) || (_BSDI_VERSION >= 199701)
#if defined(__NetBSD__) || defined(__OpenBSD__) || \
(_BSDI_VERSION >= 199701) || (__FreeBSD_version >= 300003)
u_long cmd;
#else
int cmd;

8
sys/netinet/ip_fil.h
View file

@ -6,7 +6,7 @@
* to the original author and the contributors.
*
* @(#)ip_fil.h 1.35 6/5/96
* $Id: ip_fil.h,v 1.2 1998/03/21 13:37:44 peter Exp $
* $Id: ip_fil.h,v 1.3 1998/06/07 17:12:15 dfr Exp $
*/
#ifndef __IP_FIL_H__
@ -382,7 +382,8 @@ extern int ipf_log __P((void));
extern void ipfr_fastroute __P((ip_t *, fr_info_t *, frdest_t *));
extern struct ifnet *get_unit __P((char *));
# define FR_SCANLIST(p, ip, fi, m) fr_scanlist(p, ip, fi, m)
# if defined(__NetBSD__) || defined(__OpenBSD__) || (_BSDI_VERSION >= 199701) || (__FreeBSD_version >= 300003)
# if defined(__NetBSD__) || defined(__OpenBSD__) || \
(_BSDI_VERSION >= 199701) || (__FreeBSD_version >= 300003)
extern int iplioctl __P((dev_t, u_long, caddr_t, int));
# else
extern int iplioctl __P((dev_t, int, caddr_t, int));
@ -447,7 +448,8 @@ extern int iplidentify __P((char *));
# endif
# if (_BSDI_VERSION >= 199510) || (__FreeBSD_version >= 220000) || \
(NetBSD >= 199511)
# if defined(__NetBSD__) || (_BSDI_VERSION >= 199701)
# if defined(__NetBSD__) || (_BSDI_VERSION >= 199701) || \
(__FreeBSD_version >= 300003)
extern int iplioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
# else
extern int iplioctl __P((dev_t, int, caddr_t, int, struct proc *));