defines change

This commit is contained in:
cgd 1993-11-23 04:51:25 +00:00
parent d232586c4f
commit 9e078d7394
2 changed files with 5 additions and 9 deletions

View File

@ -36,17 +36,13 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)bpf.c 7.5 (Berkeley) 7/15/91 * from: @(#)bpf.c 7.5 (Berkeley) 7/15/91
* $Id: bpf.c,v 1.6 1993/11/15 09:56:46 deraadt Exp $ * $Id: bpf.c,v 1.7 1993/11/23 04:51:25 cgd Exp $
*/ */
#include "bpfilter.h" #include "bpfilter.h"
#if NBPFILTER > 0 #if NBPFILTER > 0
#ifndef __386BSD__
#define __386BSD__
#endif
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/mbuf.h> #include <sys/mbuf.h>
@ -477,7 +473,7 @@ bpf_wakeup(d)
register struct bpf_d *d; register struct bpf_d *d;
{ {
wakeup((caddr_t)d); wakeup((caddr_t)d);
#if (BSD > 199103) || defined(__386BSD__) #if (BSD > 199103) || defined(__NetBSD__)
selwakeup(&d->bd_sel); selwakeup(&d->bd_sel);
/* XXX */ /* XXX */
d->bd_sel.si_pid = 0; d->bd_sel.si_pid = 0;
@ -950,7 +946,7 @@ bpf_select(dev, rw, p)
splx(s); splx(s);
return (1); return (1);
} }
#if defined(__386BSD__) #if defined(__NetBSD__)
selrecord(p, &d->bd_sel); selrecord(p, &d->bd_sel);
#else #else
/* /*

View File

@ -36,7 +36,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)bpfdesc.h 7.1 (Berkeley) 5/7/91 * from: @(#)bpfdesc.h 7.1 (Berkeley) 5/7/91
* $Id: bpfdesc.h,v 1.6 1993/09/09 09:43:18 davidg Exp $ * $Id: bpfdesc.h,v 1.7 1993/11/23 04:51:29 cgd Exp $
*/ */
#ifndef _NET_BPFDESC_H_ #ifndef _NET_BPFDESC_H_
@ -75,7 +75,7 @@ struct bpf_d {
u_char bd_promisc; /* true if listening promiscuously */ u_char bd_promisc; /* true if listening promiscuously */
u_char bd_state; /* idle, waiting, or timed out */ u_char bd_state; /* idle, waiting, or timed out */
u_char bd_immediate; /* true to return on packet arrival */ u_char bd_immediate; /* true to return on packet arrival */
#if (BSD <= 199103) && !defined(__386BSD__) #if (BSD <= 199103) && !defined(__NetBSD__)
u_char bd_selcoll; /* true if selects collide */ u_char bd_selcoll; /* true if selects collide */
int bd_timedout; int bd_timedout;
struct proc * bd_selproc; /* process that last selected us */ struct proc * bd_selproc; /* process that last selected us */