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.

6 files changed, 53 insertions, 39 deletions

diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index f23e66d..0bd94ea 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -42,13 +42,14 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ifconfig.c	8.2 (Berkeley) 2/16/94";
 */
 static const char rcsid[] =
-	"$Id$";
+	"$Id: ifconfig.c,v 1.20 1996/11/21 19:36:09 wollman Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/sbin/ipfw/ipfw.c b/sbin/ipfw/ipfw.c
index b97d38f..7487b21 100644
--- a/sbin/ipfw/ipfw.c
+++ b/sbin/ipfw/ipfw.c
@@ -16,22 +16,26 @@
  *
  * NEW command line interface for IP firewall facility
  *
- * $Id: ipfw.c,v 1.33 1996/08/31 17:58:23 nate Exp $
+ * $Id: ipfw.c,v 1.34 1996/10/17 01:05:03 alex Exp $
  *
  */
 
-#include <stdio.h>
+#include <sys/types.h>
+#include <sys/queue.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/time.h>
+
 #include <ctype.h>
 #include <err.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <netdb.h>
 #include <limits.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <time.h>
-#include <sys/queue.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
+#include <unistd.h>
+
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/ip_fw.h>
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 84dee1d..339d841 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)route.c	8.3 (Berkeley) 3/19/94";
 */
 static const char rcsid[] =
-	"$Id: route.c,v 1.16 1996/10/27 17:42:14 fenner Exp $";
+	"$Id: route.c,v 1.17 1996/11/01 20:30:37 wollman Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -51,6 +51,7 @@ static const char rcsid[] =
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <net/route.h>
@@ -69,15 +70,16 @@ static const char rcsid[] =
 #include <arpa/inet.h>
 #include <netdb.h>
 
+#include <ctype.h>
+#include <err.h>
 #include <errno.h>
-#include <unistd.h>
+#include <paths.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include <paths.h>
-#include <err.h>
 #include <sysexits.h>
+#include <time.h>
+#include <unistd.h>
 
 struct keytab {
 	char	*kt_cp;
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index 5dd0b8b..d87029d 100644
--- a/sbin/routed/defs.h
+++ b/sbin/routed/defs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/5/93
- *	$Id: defs.h,v 1.2 1996/09/16 17:03:29 wollman Exp $
+ *	$Id: defs.h,v 1.3 1996/11/19 20:42:11 wollman Exp $
  */
 
 /* Definitions for RIPv2 routing process.
@@ -77,6 +77,7 @@
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #ifdef sgi
 #include <net/radix.h>
 #else
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index be4bf1a..b500a4b 100644
--- a/sbin/slattach/slattach.c
+++ b/sbin/slattach/slattach.c
@@ -42,26 +42,29 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)slattach.c	4.6 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id";
+static char rcsid[] = "$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
-#include <termios.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <net/slip.h>
-#include <net/if_slvar.h>
-#include <netdb.h>
+#include <sys/types.h>
+
 #include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
+#include <netdb.h>
 #include <paths.h>
-#include <syslog.h>
 #include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <strings.h>
+#include <syslog.h>
+#include <termios.h>
+#include <unistd.h>
+
+#include <netinet/in.h>
+#include <net/if.h>
+#include <net/slip.h>
+#include <net/if_slvar.h>
 
 #define DEFAULT_BAUD	9600
 
diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c
index f5d121b..222d163 100644
--- a/sbin/startslip/startslip.c
+++ b/sbin/startslip/startslip.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: startslip.c,v 1.17 1995/09/20 04:56:09 ache Exp $
+ * $Id: startslip.c,v 1.18 1995/09/27 17:15:37 ache Exp $
  */
 
 #ifndef lint
@@ -43,25 +43,28 @@ static char copyright[] =
 static char sccsid[] = "@(#)startslip.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 
-#include <termios.h>
-#include <time.h>
-#include <sys/ioctl.h>
 #include <sys/types.h>
+#include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <syslog.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <net/if_slvar.h>
-#include <net/slip.h>
-#include <netdb.h>
+#include <sys/time.h>
+
 #include <errno.h>
 #include <fcntl.h>
+#include <paths.h>
+#include <netdb.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <signal.h>
 #include <string.h>
+#include <syslog.h>
+#include <termios.h>
+#include <time.h>
 #include <unistd.h>
-#include <paths.h>
+
+#include <netinet/in.h>
+#include <net/if.h>
+#include <net/if_slvar.h>
+#include <net/slip.h>
 
 #define DEFAULT_BAUD    B9600
 int     speed = DEFAULT_BAUD;