diff options
| author | bde <bde@FreeBSD.org> | 1996-10-12 19:49:43 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1996-10-12 19:49:43 +0000 |
| commit | 8c49d9975c6bbd7704d4d1247e57ce623ee4dbf9 (patch) | |
| tree | 715865e54cd9bdfcb3c50cf8433ebb6486247758 /sys/net | |
| parent | a642135de9649b69941f77b4bac4756d39929ece (diff) | |
| download | FreeBSD-src-8c49d9975c6bbd7704d4d1247e57ce623ee4dbf9.zip FreeBSD-src-8c49d9975c6bbd7704d4d1247e57ce623ee4dbf9.tar.gz | |
Removed nested include if <sys/socket.h> from <net/if.h> and
<net/if_arp.h> and fixed the things that depended on it. The nested
include just allowed unportable programs to compile and made my
simple #include checking program report that networking code doesn't
need to include <sys/socket.h>.
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if.h | 4 | ||||
| -rw-r--r-- | sys/net/if_arp.h | 4 | ||||
| -rw-r--r-- | sys/net/if_mib.c | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/sys/net/if.h b/sys/net/if.h index 056b711..1f08bcb 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.h 8.1 (Berkeley) 6/10/93 - * $Id: if.h,v 1.33 1996/08/04 10:54:12 phk Exp $ + * $Id: if.h,v 1.34 1996/08/26 23:17:17 julian Exp $ */ #ifndef _NET_IF_H_ @@ -62,8 +62,6 @@ * interfaces. These routines live in the files if.c and route.c */ -#include <sys/socket.h> /* for struct sockaddr */ - #ifndef _TIME_ /* XXX fast fix for SNMP, going away soon */ #include <sys/time.h> #endif diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h index 1515110..d7718cd 100644 --- a/sys/net/if_arp.h +++ b/sys/net/if_arp.h @@ -31,14 +31,12 @@ * SUCH DAMAGE. * * @(#)if_arp.h 8.1 (Berkeley) 6/10/93 - * $Id: if_arp.h,v 1.4 1994/11/15 14:41:38 bde Exp $ + * $Id: if_arp.h,v 1.5 1994/11/16 02:15:05 phk Exp $ */ #ifndef _NET_IF_ARP_H_ #define _NET_IF_ARP_H_ -#include <sys/socket.h> /* for struct sockaddr */ - /* * Address Resolution Protocol. * diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c index bb14745..7bf4d18 100644 --- a/sys/net/if_mib.c +++ b/sys/net/if_mib.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: if_mib.c,v 1.1 1996/07/30 19:17:00 wollman Exp $ */ #include <sys/param.h> @@ -34,6 +34,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/errno.h> +#include <sys/socket.h> #include <sys/sysctl.h> #include <net/if.h> |
