From d3ecee07b35f58cb9d8e5e3c25e923af0c1c5056 Mon Sep 17 00:00:00 2001
From: wollman <wollman@FreeBSD.org>
Date: Tue, 10 Dec 1996 17:11:53 +0000
Subject: Fix up programs which expect <net/if.h> to include <sys/time.h> to
 instead do it themselves.  (Some of these programs actually depended on this
 beyond compiling the definition of struct ifinfo!)  Also fix up some other
 #include messes while we're at it.

---
 usr.bin/netstat/atalk.c  | 5 +----
 usr.bin/netstat/if.c     | 1 +
 usr.bin/netstat/ipx.c    | 3 +--
 usr.bin/netstat/mroute.c | 1 +
 usr.bin/netstat/route.c  | 3 ++-
 5 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'usr.bin/netstat')

diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index 3087426..575ac87 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)atalk.c	1.1 (Whistle) 6/6/96";
 */
 static const char rcsid[] =
-	"$Id$";
+	"$Id: atalk.c,v 1.6 1996/10/28 18:56:31 wollman Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -46,9 +46,6 @@ static const char rcsid[] =
 #include <sys/protosw.h>
 
 #include <net/route.h>
-#include <net/if.h>
-
-#include <netinet/tcp_fsm.h>
 
 #include <netatalk/at.h>
 #include <netatalk/ddp_var.h>
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 6c9db22..fb7ef44 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -38,6 +38,7 @@ static char sccsid[] = "@(#)if.c	8.3 (Berkeley) 4/28/95";
 #include <sys/types.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index fb55788..c6346d6 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ns.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-	"$Id$";
+	"$Id: ipx.c,v 1.4 1996/10/28 18:56:39 wollman Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -46,7 +46,6 @@ static const char rcsid[] =
 #include <sys/protosw.h>
 
 #include <net/route.h>
-#include <net/if.h>
 
 #include <netinet/tcp_fsm.h>
 
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index 45c47b5..68a15f5 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -49,6 +49,7 @@
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/mbuf.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 74bbdde..2da464f 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -36,12 +36,13 @@
 static char sccsid[] = "From: @(#)route.c	8.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: route.c,v 1.20 1996/10/09 18:19:07 wollman Exp $";
+	"$Id: route.c,v 1.21 1996/10/28 18:56:44 wollman Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
-- 
cgit v1.1