From 628d2ac1b093f48f6fb98b17308acacc929876d8 Mon Sep 17 00:00:00 2001
From: Garrett 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.

---
 libexec/bootpd/getether.c                    | 3 ++-
 libexec/bootpd/getif.c                       | 4 +---
 libexec/bootpd/lookup.c                      | 4 +---
 libexec/bootpd/rtmsg.c                       | 3 ++-
 libexec/bootpd/tools/bootptest/print-bootp.c | 4 +---
 libexec/rbootd/bpf.c                         | 3 ++-
 6 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'libexec')

diff --git a/libexec/bootpd/getether.c b/libexec/bootpd/getether.c
index c396c8125484..dc3a88ccd4f5 100644
--- a/libexec/bootpd/getether.c
+++ b/libexec/bootpd/getether.c
@@ -7,7 +7,7 @@
  * If you figure out how to do this on another system,
  * please let me know.  <gwr@mc.com>
  *
- *	$Id$
+ *	$Id: getether.c,v 1.4 1996/09/22 21:52:09 wosch Exp $
  */
 
 #include <sys/types.h>
@@ -111,6 +111,7 @@ getether(ifname, eap)
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 /* Thanks to John Brezak <brezak@ch.hp.com> for this code. */
 #include <sys/ioctl.h>
+#include <sys/time.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
diff --git a/libexec/bootpd/getif.c b/libexec/bootpd/getif.c
index eeff50f081d2..2d72909ef859 100644
--- a/libexec/bootpd/getif.c
+++ b/libexec/bootpd/getif.c
@@ -1,7 +1,7 @@
 /*
  * getif.c : get an interface structure
  *
- *	$Id$
+ *	$Id: getif.c,v 1.3 1996/09/22 21:52:12 wosch Exp $
  */
 
 #include <sys/types.h>
@@ -15,9 +15,7 @@
 #include <sys/stropts.h>
 #endif
 
-#ifdef _AIX32
 #include <sys/time.h>		/* for struct timeval in net/if.h */	
-#endif
 #include <net/if.h>				/* for struct ifreq */
 #include <netinet/in.h>
 
diff --git a/libexec/bootpd/lookup.c b/libexec/bootpd/lookup.c
index ed1a27cbe2cf..b5b51b547cbc 100644
--- a/libexec/bootpd/lookup.c
+++ b/libexec/bootpd/lookup.c
@@ -1,15 +1,13 @@
 /*
  * lookup.c - Lookup IP address, HW address, netmask
  *
- *	$Id$
+ *	$Id: lookup.c,v 1.2 1996/09/22 21:52:21 wosch Exp $
  */
 
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#ifdef _AIX32
 #include <sys/time.h>	/* for struct timeval in net/if.h */
-#endif
 #include <net/if.h>
 #include <netinet/in.h>
 
diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c
index 5942b22d13f4..0338a95291ef 100644
--- a/libexec/bootpd/rtmsg.c
+++ b/libexec/bootpd/rtmsg.c
@@ -39,7 +39,7 @@
 
 /*
  * from arp.c	8.2 (Berkeley) 1/2/94
- * $Id: rtmsg.c,v 1.3 1995/01/30 11:11:43 dfr Exp $
+ * $Id: rtmsg.c,v 1.4 1995/05/30 05:45:49 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -51,6 +51,7 @@
 
 #include <sys/socket.h>
 #include <sys/filio.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/libexec/bootpd/tools/bootptest/print-bootp.c b/libexec/bootpd/tools/bootptest/print-bootp.c
index 8390321912a3..b51f42c383cc 100644
--- a/libexec/bootpd/tools/bootptest/print-bootp.c
+++ b/libexec/bootpd/tools/bootptest/print-bootp.c
@@ -23,7 +23,7 @@
  * This file was copied from tcpdump-2.1.1 and modified.
  * There is an e-mail list for tcpdump: <tcpdump@ee.lbl.gov>
  *
- *	$Id$
+ *	$Id: print-bootp.c,v 1.2 1996/09/22 21:52:58 wosch Exp $
  */
 
 #include <stdio.h>
@@ -32,9 +32,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#ifdef _AIX32
 #include <sys/time.h>	/* for struct timeval in net/if.h */
-#endif
 #include <net/if.h>
 #include <netinet/in.h>
 
diff --git a/libexec/rbootd/bpf.c b/libexec/rbootd/bpf.c
index c39150cae449..4b24aa47846b 100644
--- a/libexec/rbootd/bpf.c
+++ b/libexec/rbootd/bpf.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bpf.c	8.1 (Berkeley) 6/4/93
- *	$Id$
+ *	$Id: bpf.c,v 1.3 1996/09/22 21:54:25 wosch Exp $
  *
  * Utah $Hdr: bpf.c 3.1 92/07/06$
  * Author: Jeff Forys, University of Utah CSS
@@ -52,6 +52,7 @@ static char sccsid[] = "@(#)bpf.c	8.1 (Berkeley) 6/4/93";
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <net/bpf.h>
-- 
cgit v1.3