From eb2fc780273ffdf4b21d6135aa8ec3b986e9c688 Mon Sep 17 00:00:00 2001
From: Garrett Wollman <wollman@FreeBSD.org>
Date: Tue, 10 Oct 2000 01:50:26 +0000
Subject: [PATCH] Don't depend on <sys/stat.h> bogusly including <sys/time.h>
 (and thereby <time.h>).

---
 bin/cp/utils.c                 | 1 +
 bin/dd/dd.c                    | 1 +
 games/rogue/machdep.c          | 2 ++
 libexec/ftpd/ftpd.c            | 7 ++++---
 libexec/getty/main.c           | 1 +
 libexec/rbootd/parseconf.c     | 1 +
 sbin/newfs_msdos/newfs_msdos.c | 4 +++-
 sbin/restore/dirs.c            | 1 +
 sbin/restore/tape.c            | 2 ++
 usr.bin/compress/compress.c    | 1 +
 usr.bin/ftp/ftp.c              | 1 +
 usr.sbin/tzsetup/tzsetup.c     | 1 +
 12 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 86ab3ab6c87c..34b0225ac308 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -41,6 +41,7 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
 #include <sys/mman.h>
 #endif
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index a7b8c66930b9..a5bb0328562a 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -54,6 +54,7 @@ static const char rcsid[] =
 #include <sys/conf.h>
 #include <sys/disklabel.h>
 #include <sys/filio.h>
+#include <sys/time.h>
 
 #include <ctype.h>
 #include <err.h>
diff --git a/games/rogue/machdep.c b/games/rogue/machdep.c
index a66bdb3be439..39cfa81801ef 100644
--- a/games/rogue/machdep.c
+++ b/games/rogue/machdep.c
@@ -99,7 +99,9 @@ static const char rcsid[] =
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>
+
 #include <pwd.h>
+#include <time.h>
 
 #ifdef UNIX_BSD4_2
 #include <sys/time.h>
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index f4a40aaa7d81..0035051f8533 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -51,11 +51,12 @@ static const char rcsid[] =
  * FTP server.
  */
 #include <sys/param.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
 #include <sys/mman.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/wait.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index 6cd1af834ac2..68adab9049d7 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -51,6 +51,7 @@ static const char rcsid[] =
 #include <sys/resource.h>
 #include <sys/ttydefaults.h>
 #include <sys/utsname.h>
+
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c
index 21e4c0b1b2a1..bd2f2e1c2f3e 100644
--- a/libexec/rbootd/parseconf.c
+++ b/libexec/rbootd/parseconf.c
@@ -54,6 +54,7 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 
 #include <ctype.h>
 #include <dirent.h>
diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c
index d6648fcad44e..d0085f72323d 100644
--- a/sbin/newfs_msdos/newfs_msdos.c
+++ b/sbin/newfs_msdos/newfs_msdos.c
@@ -31,10 +31,11 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <sys/param.h>
-#include <sys/stat.h>
 #include <sys/diskslice.h>
 #include <sys/disklabel.h>
 #include <sys/mount.h>
+#include <sys/stat.h>
+#include <sys/time.h>
 
 #include <ctype.h>
 #include <err.h>
@@ -44,6 +45,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #define MAXU16	  0xffff	/* maximum unsigned 16-bit quantity */
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index f30eacdc9094..d7faa168ee1b 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -47,6 +47,7 @@ static const char rcsid[] =
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 602ce61a81aa..dc187a56299c 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -48,6 +48,7 @@ static const char rcsid[] =
 #include <sys/file.h>
 #include <sys/mtio.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 
 #include <ufs/ufs/dinode.h>
 #include <protocols/dumprestore.h>
@@ -57,6 +58,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "restore.h"
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index bb8b1bfecb75..49781962b8ce 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -47,6 +47,7 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index abbad7f49712..5ef7723261f2 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -47,6 +47,7 @@ __RCSID_SOURCE("$NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c
index a513870c5251..68aaa0cc7117 100644
--- a/usr.sbin/tzsetup/tzsetup.c
+++ b/usr.sbin/tzsetup/tzsetup.c
@@ -44,6 +44,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include <sys/fcntl.h>