From 299a6b4d7bf40c30e4a52ee8311c17ffd42b3035 Mon Sep 17 00:00:00 2001
From: Rob Landley
Date: Sat, 27 May 2006 21:42:58 +0000
Subject: Consolidate #include <sys/time.h> so libbb.h does it.

---
 coreutils/date.c           | 1 -
 coreutils/dos2unix.c       | 1 -
 coreutils/nice.c           | 1 -
 e2fsprogs/e2fsck.h         | 1 -
 e2fsprogs/ext2fs/bmove.c   | 1 -
 e2fsprogs/uuid/gen_uuid.c  | 1 -
 e2fsprogs/uuid/uuid.h      | 1 -
 e2fsprogs/uuid/uuid_time.c | 1 -
 editors/vi.c               | 1 -
 include/libbb.h            | 2 ++
 init/init.c                | 1 -
 loginutils/login.c         | 1 -
 loginutils/su.c            | 1 -
 loginutils/sulogin.c       | 1 -
 miscutils/adjtimex.c       | 1 -
 miscutils/devfsd.c         | 1 -
 miscutils/hdparm.c         | 1 -
 miscutils/time.c           | 1 -
 networking/arping.c        | 1 -
 networking/fakeidentd.c    | 1 -
 networking/ftpgetput.c     | 1 -
 networking/httpd.c         | 1 -
 networking/inetd.c         | 1 -
 networking/nc.c            | 1 -
 networking/ping.c          | 1 -
 networking/ping6.c         | 1 -
 networking/telnet.c        | 7 -------
 networking/telnetd.c       | 1 -
 networking/tftp.c          | 1 -
 networking/traceroute.c    | 1 -
 networking/udhcp/arpping.c | 1 -
 networking/udhcp/dhcpc.c   | 1 -
 networking/udhcp/dhcpd.c   | 1 -
 networking/wget.c          | 1 -
 networking/zcip.c          | 1 -
 procps/renice.c            | 1 -
 procps/top.c               | 2 --
 shell/ash.c                | 1 -
 util-linux/hwclock.c       | 1 -
 util-linux/rdate.c         | 1 -
 40 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/coreutils/date.c b/coreutils/date.c
index 401d2ff..a922eb9 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -11,7 +11,6 @@
 
 #include <stdlib.h>
 #include <errno.h>
-#include <sys/time.h>
 #include <unistd.h>
 #include <time.h>
 #include <stdio.h>
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index c5021f9..cf98c4f 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -15,7 +15,6 @@
 #include <unistd.h>
 #include <stdint.h>
 #include <fcntl.h>
-#include <sys/time.h>
 #include "busybox.h"
 
 #define CT_UNIX2DOS     1
diff --git a/coreutils/nice.c b/coreutils/nice.c
index 449184d..e8cee6c 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -26,7 +26,6 @@
 #include <limits.h>
 #include <errno.h>
 #include <unistd.h>
-#include <sys/time.h>
 #include <sys/resource.h>
 #include "busybox.h"
 
diff --git a/e2fsprogs/e2fsck.h b/e2fsprogs/e2fsck.h
index 43080d2..b480d8f 100644
--- a/e2fsprogs/e2fsck.h
+++ b/e2fsprogs/e2fsck.h
@@ -14,7 +14,6 @@
 #include <stddef.h>
 #include <assert.h>
 #include <signal.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/resource.h>
 #include <sys/param.h>
diff --git a/e2fsprogs/ext2fs/bmove.c b/e2fsprogs/ext2fs/bmove.c
index afc2710..8db9051 100644
--- a/e2fsprogs/ext2fs/bmove.c
+++ b/e2fsprogs/ext2fs/bmove.c
@@ -14,7 +14,6 @@
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include <sys/time.h>
 
 #include "ext2_fs.h"
 #include "ext2fsP.h"
diff --git a/e2fsprogs/uuid/gen_uuid.c b/e2fsprogs/uuid/gen_uuid.c
index d847774..24eb852 100644
--- a/e2fsprogs/uuid/gen_uuid.c
+++ b/e2fsprogs/uuid/gen_uuid.c
@@ -38,7 +38,6 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 #ifdef HAVE_SYS_IOCTL_H
diff --git a/e2fsprogs/uuid/uuid.h b/e2fsprogs/uuid/uuid.h
index cd97a5e..95602c9 100644
--- a/e2fsprogs/uuid/uuid.h
+++ b/e2fsprogs/uuid/uuid.h
@@ -36,7 +36,6 @@
 #define _UUID_UUID_H
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <time.h>
 
 typedef unsigned char uuid_t[16];
diff --git a/e2fsprogs/uuid/uuid_time.c b/e2fsprogs/uuid/uuid_time.c
index 9ff3607..51f87de 100644
--- a/e2fsprogs/uuid/uuid_time.c
+++ b/e2fsprogs/uuid/uuid_time.c
@@ -38,7 +38,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <sys/time.h>
 #include <time.h>
 
 #include "uuidP.h"
diff --git a/editors/vi.c b/editors/vi.c
index 7d54978..1e8f383 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -57,7 +57,6 @@
 #include <termios.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <time.h>
diff --git a/include/libbb.h b/include/libbb.h
index 3bb663b..fdb2022 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -24,6 +24,8 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
+#include <sys/time.h>
+
 #include "bb_config.h"
 #ifdef CONFIG_SELINUX
 #include <selinux/selinux.h>
diff --git a/init/init.c b/init/init.c
index b0443d0..ec3c4d7 100644
--- a/init/init.c
+++ b/init/init.c
@@ -91,7 +91,6 @@ struct serial_struct {
  */
 #define CORE_ENABLE_FLAG_FILE "/.init_enable_core"
 #include <sys/resource.h>
-#include <sys/time.h>
 #endif
 
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/loginutils/login.c b/loginutils/login.c
index b136732..46c4ade 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -10,7 +10,6 @@
 #include <utmp.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <ctype.h>
 #include <time.h>
diff --git a/loginutils/su.c b/loginutils/su.c
index b022778..a6fcd73 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -14,7 +14,6 @@
 #include <utmp.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <ctype.h>
 #include <time.h>
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index 8c5d88a..66f8f01 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -9,7 +9,6 @@
 #include <utmp.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <ctype.h>
 #include <time.h>
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index 4a242cf..b5e87ba 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -44,7 +44,6 @@
 #include <sys/types.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/time.h>
 #include <sys/timex.h>
 #include "busybox.h"
 
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index f99a946..aa682dc 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -57,7 +57,6 @@
 #include <stdarg.h>
 #include <string.h>
 #include <ctype.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 6a81498..7511f35 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -20,7 +20,6 @@
 #include <endian.h>
 #include <sys/ioctl.h>
 #include <sys/sysmacros.h>
-#include <sys/time.h>
 #include <sys/times.h>
 #include <sys/mount.h>
 #include <sys/mman.h>
diff --git a/miscutils/time.c b/miscutils/time.c
index 89c4854..0a2fb77 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <limits.h>
 #include <unistd.h>
-#include <sys/time.h>
 #include <sys/types.h>		/* For pid_t. */
 #include <sys/wait.h>
 #include <sys/param.h>		/* For getpagesize, maybe.  */
diff --git a/networking/arping.c b/networking/arping.c
index 303e499..e12fa50 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -10,7 +10,6 @@
 
 #include <sys/ioctl.h>
 #include <signal.h>
-#include <sys/time.h>
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/networking/fakeidentd.c b/networking/fakeidentd.c
index cae6b81..d3aa3ce 100644
--- a/networking/fakeidentd.c
+++ b/networking/fakeidentd.c
@@ -23,7 +23,6 @@
 
 #include <sys/syslog.h>
 #include <sys/types.h>
-#include <sys/time.h>
 #include <time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index a401ec5..48b18b5 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -15,7 +15,6 @@
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 
 #include <ctype.h>
diff --git a/networking/httpd.c b/networking/httpd.c
index 1d8c893..4cd0944 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -99,7 +99,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>    /* for connect and socket*/
 #include <netinet/in.h>    /* for sockaddr_in       */
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <fcntl.h>         /* for open modes        */
diff --git a/networking/inetd.c b/networking/inetd.c
index 39a2b24..3ecd322 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -134,7 +134,6 @@
 #include <sys/un.h>
 #include <sys/file.h>
 #include <sys/wait.h>
-#include <sys/time.h>
 #include <sys/resource.h>
 
 
diff --git a/networking/nc.c b/networking/nc.c
index 637e975..24f1aa5 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -24,7 +24,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <sys/time.h>
 #include <sys/ioctl.h>
 #include "busybox.h"
 
diff --git a/networking/ping.c b/networking/ping.c
index 7fe52ab..d9d76bf 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -15,7 +15,6 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/file.h>
-#include <sys/time.h>
 #include <sys/times.h>
 #include <signal.h>
 
diff --git a/networking/ping6.c b/networking/ping6.c
index 3f632e0..1cff59d 100644
--- a/networking/ping6.c
+++ b/networking/ping6.c
@@ -37,7 +37,6 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/file.h>
-#include <sys/time.h>
 #include <sys/times.h>
 #include <signal.h>
 
diff --git a/networking/telnet.c b/networking/telnet.c
index b3045f8..c835c7a 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -45,13 +45,6 @@ enum { DOTRACE = 1 };
 #define TRACE(x, y)
 #endif
 
-#if 0
-#define USE_POLL
-#include <sys/poll.h>
-#else
-#include <sys/time.h>
-#endif
-
 #define DATABUFSIZE  128
 #define IACBUFSIZE   128
 
diff --git a/networking/telnetd.c b/networking/telnetd.c
index d51560b..5a11ffb 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -24,7 +24,6 @@
 /*#define DEBUG 1 */
 #undef DEBUG
 
-#include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/ioctl.h>
diff --git a/networking/tftp.c b/networking/tftp.c
index b830f18..bdba167 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <netdb.h>
 #include <netinet/in.h>
diff --git a/networking/traceroute.c b/networking/traceroute.c
index e0f17a5..190f19d 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -218,7 +218,6 @@
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <sys/time.h>                           /* concession to AIX */
 #include <sys/select.h>
 #include "inet_common.h"
 
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index df626f1..b029af9 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -5,7 +5,6 @@
  * by Yoichi Hariguchi <yoichi@fore.com>
  */
 
-#include <sys/time.h>
 #include <time.h>
 #include <sys/socket.h>
 #include <netinet/if_ether.h>
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 222bd65..1d9ab6d 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -7,7 +7,6 @@
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include <sys/time.h>
 #include <sys/file.h>
 #include <unistd.h>
 #include <getopt.h>
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 28acb6b..6c5a753 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -34,7 +34,6 @@
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <time.h>
-#include <sys/time.h>
 
 #include "dhcpd.h"
 #include "arpping.h"
diff --git a/networking/wget.c b/networking/wget.c
index d55f4b0..fdcc68d 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -17,7 +17,6 @@
 #include <signal.h>
 #include <sys/ioctl.h>
 
-#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
diff --git a/networking/zcip.c b/networking/zcip.c
index ed30bb3..b5a904d 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -38,7 +38,6 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <sys/time.h>
 #include <sys/socket.h>
 
 #include <arpa/inet.h>
diff --git a/procps/renice.c b/procps/renice.c
index d4ce66d..711ed16 100644
--- a/procps/renice.c
+++ b/procps/renice.c
@@ -38,7 +38,6 @@
 #include <limits.h>
 #include <errno.h>
 #include <unistd.h>
-#include <sys/time.h>
 #include <sys/resource.h>
 #include "busybox.h"
 
diff --git a/procps/top.c b/procps/top.c
index 691b4ea..c0d16b6 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -40,7 +40,6 @@
 
 #ifdef CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
 #include <time.h>
-#include <sys/time.h>
 #include <fcntl.h>
 #include <netinet/in.h>  /* htons */
 #endif
@@ -370,7 +369,6 @@ static void clearmems(void)
 
 #ifdef CONFIG_FEATURE_USE_TERMIOS
 #include <termios.h>
-#include <sys/time.h>
 #include <signal.h>
 
 
diff --git a/shell/ash.c b/shell/ash.c
index 33eaf92..c8ccf19 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -58,7 +58,6 @@
 #include <sys/param.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/wait.h>
 
 #include <stdio.h>
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 3d7f400..e1a67f2 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -9,7 +9,6 @@
 
 
 #include <sys/ioctl.h>
-#include <sys/time.h>
 #include <sys/utsname.h>
 #include <ctype.h>
 #include <fcntl.h>
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 2b011eb..27bd1b4 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -8,7 +8,6 @@
  * Licensed under GPL v2 or later, see file License for details.
 */
 
-#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-- 
cgit v1.1