diff options
author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 1997-10-11 01:21:18 +0000 |
---|---|---|
committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 1997-10-11 01:21:18 +0000 |
commit | e83f95146815c2b8bab31b4f08b190bc198bc86f (patch) | |
tree | e49683d69993245441deb941370a107cd8842499 | |
parent | b7f1ffdeb0b38c5535577b8b29c09ea4df9d10f7 (diff) |
Fix some minor compilation problems.
-rw-r--r-- | sys/netnatm/natm.c | 11 | ||||
-rw-r--r-- | sys/netnatm/natm.h | 7 |
2 files changed, 2 insertions, 16 deletions
diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c index 2a2cdb9b5b7..3e70de11012 100644 --- a/sys/netnatm/natm.c +++ b/sys/netnatm/natm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: natm.c,v 1.3 1996/11/09 03:28:59 chuck Exp $ */ +/* $OpenBSD: natm.c,v 1.4 1997/10/11 01:21:16 angelos Exp $ */ /* * @@ -67,19 +67,10 @@ u_long natm0_recvspace = 16*1024; * user requests */ -#if defined(__NetBSD__) || defined(__OpenBSD__) -int natm_usrreq(so, req, m, nam, control, p) -#elif defined(__FreeBSD__) int natm_usrreq(so, req, m, nam, control) -#endif - struct socket *so; int req; struct mbuf *m, *nam, *control; -#if defined(__NetBSD__) || defined(__OpenBSD__) -struct proc *p; -#endif - { int error = 0, s, s2; struct natmpcb *npcb; diff --git a/sys/netnatm/natm.h b/sys/netnatm/natm.h index 084e358f18d..89b0b75662a 100644 --- a/sys/netnatm/natm.h +++ b/sys/netnatm/natm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: natm.h,v 1.3 1997/07/19 22:56:35 chuck Exp $ */ +/* $OpenBSD: natm.h,v 1.4 1997/10/11 01:21:17 angelos Exp $ */ /* * @@ -138,13 +138,8 @@ void npcb_free __P((struct natmpcb *, int)); struct natmpcb *npcb_add __P((struct natmpcb *, struct ifnet *, int, int)); /* natm.c */ -#if defined(__NetBSD__) || defined(__OpenBSD__) -int natm_usrreq __P((struct socket *, int, struct mbuf *, - struct mbuf *, struct mbuf *, struct proc *)); -#elif defined(__FreeBSD__) int natm_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *, struct mbuf *)); -#endif int natm0_sysctl __P((int *, u_int, void *, size_t *, void *, size_t)); int natm5_sysctl __P((int *, u_int, void *, size_t *, void *, size_t)); void natmintr __P((void)); |