diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-04 08:21:54 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-04 08:21:54 +0000 |
| commit | c17d6de160d5961d870698e434f6126d98119907 (patch) | |
| tree | c5741d39206423d0f827f3460859205620d66a7f /sys | |
| parent | 92cdd22ea0b6e6726ed0f81d2d9acd458ee929e6 (diff) | |
From NetBSD: Fix PR/2095 options MROUTING did not compile.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/in_proto.c | 6 | ||||
| -rw-r--r-- | sys/netinet/raw_ip.c | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index 51dc49af433..74a66e49e04 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -1,5 +1,5 @@ -/* $OpenBSD: in_proto.c,v 1.2 1996/03/03 22:30:33 niklas Exp $ */ -/* $NetBSD: in_proto.c,v 1.13 1996/02/13 23:42:09 christos Exp $ */ +/* $OpenBSD: in_proto.c,v 1.3 1996/03/04 08:21:53 niklas Exp $ */ +/* $NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -81,7 +81,7 @@ #endif /* EON */ #ifdef MROUTING -#include <netinet/mroute.h> +#include <netinet/ip_mroute.h> #endif /* MROUTING */ extern struct domain inetdomain; diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 498d38a6e04..38562c2a2ae 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -1,5 +1,5 @@ -/* $OpenBSD: raw_ip.c,v 1.3 1996/03/03 22:30:43 niklas Exp $ */ -/* $NetBSD: raw_ip.c,v 1.24 1996/02/13 23:43:29 christos Exp $ */ +/* $OpenBSD: raw_ip.c,v 1.4 1996/03/04 08:21:52 niklas Exp $ */ +/* $NetBSD: raw_ip.c,v 1.25 1996/02/18 18:58:33 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1988, 1993 @@ -205,6 +205,9 @@ rip_ctloutput(op, so, level, optname, m) struct mbuf **m; { register struct inpcb *inp = sotoinpcb(so); +#ifdef MROUTING + int error; +#endif if (level != IPPROTO_IP) { if (m != 0 && *m != 0) |