diff options
author | bde <bde@FreeBSD.org> | 1994-11-15 14:41:38 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1994-11-15 14:41:38 +0000 |
commit | 480097ce44462733ea9f5465a4477438202ca04e (patch) | |
tree | f6e2ae36f5e3aa8b0c5cfcc3c0dc0a98c2038739 | |
parent | 0f7f4eaa5a15d2d0d4352546281e3af20c1bc8fa (diff) | |
download | FreeBSD-src-480097ce44462733ea9f5465a4477438202ca04e.zip FreeBSD-src-480097ce44462733ea9f5465a4477438202ca04e.tar.gz |
Include <sys/socket.h> for declaration of struct sockaddr. This helps
genassym compile when KERNEL is not defined.
Uniformize idempotency ifdef.
-rw-r--r-- | sys/net/if.h | 11 | ||||
-rw-r--r-- | sys/net/if_arp.h | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/sys/net/if.h b/sys/net/if.h index 006a6b6..925f0d7 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -31,11 +31,11 @@ * SUCH DAMAGE. * * @(#)if.h 8.1 (Berkeley) 6/10/93 - * $Id: if.h,v 1.7 1994/10/01 19:44:38 wollman Exp $ + * $Id: if.h,v 1.8 1994/11/14 14:06:05 bde Exp $ */ #ifndef _NET_IF_H_ -#define _NET_IF_H_ +#define _NET_IF_H_ /* * Structures defining a network interface, providing a packet @@ -61,6 +61,9 @@ * routing and gateway routines maintaining information used to locate * interfaces. These routines live in the files if.c and route.c */ + +#include <socket.h> /* for struct sockaddr */ + #ifndef _TIME_ /* XXX fast fix for SNMP, going away soon */ #include <sys/time.h> #endif @@ -368,6 +371,6 @@ void loopattach __P((void)); int looutput __P((struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *)); void lortrequest __P((int, struct rtentry *, struct sockaddr *)); -#endif +#endif /* KERNEL */ -#endif +#endif /* !_NET_IF_H_ */ diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h index 471e2e0..c7996db 100644 --- a/sys/net/if_arp.h +++ b/sys/net/if_arp.h @@ -31,11 +31,13 @@ * SUCH DAMAGE. * * @(#)if_arp.h 8.1 (Berkeley) 6/10/93 - * $Id: if_arp.h,v 1.2 1994/08/02 07:46:10 davidg Exp $ + * $Id: if_arp.h,v 1.3 1994/08/21 05:11:41 paul Exp $ */ #ifndef _NET_IF_ARP_H_ -#define _NET_IF_ARP_H_ +#define _NET_IF_ARP_H_ + +#include <socket.h> /* for struct sockaddr */ /* * Address Resolution Protocol. @@ -88,4 +90,4 @@ struct arpreq { #define ATF_PUBL 0x08 /* publish entry (respond for other host) */ #define ATF_USETRAILERS 0x10 /* has requested trailers */ -#endif +#endif /* !_NET_IF_ARP_H_ */ |