diff options
| author |   angelos <angelos@openbsd.org> | 1999-12-10 10:04:27 +0000 |
|---|---|---|
| committer | angelos <angelos@openbsd.org> | 1999-12-10 10:04:27 +0000 |
| commit | 58aa7d74bcc928aa05ad0e97ff825b2877a57993 (patch) | |
| tree | e8f799ad01c2f7921641cabf998ab30b2f79d02e /sys/netinet6/ip6protosw.h | |
| parent | sorry angelos, they are not used any more :-P (diff) | |
| download | wireguard-openbsd-58aa7d74bcc928aa05ad0e97ff825b2877a57993.tar.xz wireguard-openbsd-58aa7d74bcc928aa05ad0e97ff825b2877a57993.zip | |
Remove remaining unnecessary ifdefs (itojun will hate me for this :-)
Diffstat (limited to 'sys/netinet6/ip6protosw.h')
| -rw-r--r-- | sys/netinet6/ip6protosw.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/sys/netinet6/ip6protosw.h b/sys/netinet6/ip6protosw.h index c6cf818c8a4..7797403e251 100644 --- a/sys/netinet6/ip6protosw.h +++ b/sys/netinet6/ip6protosw.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6protosw.h,v 1.1 1999/12/08 06:50:22 itojun Exp $ */ +/* $OpenBSD: ip6protosw.h,v 1.2 1999/12/10 10:04:28 angelos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -81,9 +81,6 @@ struct socket; struct domain; struct proc; struct ip6_hdr; -#ifdef __FreeBSD__ -struct pr_usrreqs; -#endif /* * argument type for the last arg of pr_ctlinput(). @@ -96,11 +93,7 @@ struct ip6ctlparam { }; struct ip6protosw { -#if (defined(__FreeBSD__) && __FreeBSD__ < 3) || defined(__OpenBSD__) short pr_type; /* socket type used for */ -#else - int pr_type; /* socket type used for */ -#endif struct domain *pr_domain; /* domain protocol a member of */ short pr_protocol; /* protocol number */ short pr_flags; /* see below */ @@ -108,27 +101,17 @@ struct ip6protosw { /* protocol-protocol hooks */ int (*pr_input) /* input to protocol (from below) */ __P((struct mbuf **, int *, int)); -#ifdef __bsdi__ - int (*pr_output)(); /* output to protocol (from above) */ -#else int (*pr_output) /* output to protocol (from above) */ __P((struct mbuf *, ...)); -#endif void (*pr_ctlinput) /* control input (from below) */ __P((int, struct sockaddr *, void *)); int (*pr_ctloutput) /* control output (from above) */ __P((int, struct socket *, int, int, struct mbuf **)); /* user-protocol hook */ -#if !(defined(__FreeBSD__) && __FreeBSD__ < 3) && !defined(__bsdi__) int (*pr_usrreq) /* user request: see list below */ __P((struct socket *, int, struct mbuf *, struct mbuf *, struct mbuf *, struct proc *)); -#else - int (*pr_usrreq) /* user request: see list below */ - __P((struct socket *, int, struct mbuf *, - struct mbuf *, struct mbuf *)); -#endif /* utility hooks */ void (*pr_init) /* initialization hook */ @@ -140,12 +123,8 @@ struct ip6protosw { __P((void)); void (*pr_drain) /* flush any excess space possible */ __P((void)); -#ifdef __FreeBSD__ - struct pr_usrreqs *pr_usrreqs; /* supersedes pr_usrreq() */ -#else int (*pr_sysctl) /* sysctl for protocol */ __P((int *, u_int, void *, size_t *, void *, size_t)); -#endif }; #endif /* !_NETINET6_IP6PROTOSW_H_ */ |