diff options
| author | wollman <wollman@FreeBSD.org> | 1995-09-21 17:50:45 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1995-09-21 17:50:45 +0000 |
| commit | 6bdd60bf36b1d10b5705bee97186f0b3f6f9351b (patch) | |
| tree | fe24e67fd117f0500ff2556ae522d4066403e540 /sys/netinet/in_var.h | |
| parent | 0930d1478ee862c8421606bd3182b4503e073f74 (diff) | |
| download | FreeBSD-src-6bdd60bf36b1d10b5705bee97186f0b3f6f9351b.zip FreeBSD-src-6bdd60bf36b1d10b5705bee97186f0b3f6f9351b.tar.gz | |
Merge with 4.4-Lite-2. This is actually a 64-bit fix; the second parameter
to in_control() is sometimes a pointer, and sometimes an integer, so use
u_long rather than int.
Obtained from: 4.4BSD-Lite-2
Diffstat (limited to 'sys/netinet/in_var.h')
| -rw-r--r-- | sys/netinet/in_var.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index a21ec47..15c059e 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -30,8 +30,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)in_var.h 8.1 (Berkeley) 6/10/93 - * $Id: in_var.h,v 1.9 1995/03/23 18:14:41 wollman Exp $ + * @(#)in_var.h 8.2 (Berkeley) 1/9/95 + * $Id: in_var.h,v 1.10 1995/05/30 08:09:32 rgrimes Exp $ */ #ifndef _NETINET_IN_VAR_H_ @@ -222,7 +222,8 @@ int in_ifinit __P((struct ifnet *, struct in_multi *in_addmulti __P((struct in_addr *, struct ifnet *)); void in_delmulti __P((struct in_multi *)); void in_ifscrub __P((struct ifnet *, struct in_ifaddr *)); -int in_control __P((struct socket *, int, caddr_t, struct ifnet *)); +int in_control __P((struct socket *, u_long, caddr_t, struct ifnet *)); -#endif -#endif +#endif /* KERNEL */ + +#endif /* _NETINET_IN_VAR_H_ */ |
