From 2eba8afab5e8bdc32a0f6365de070eaa7f383149 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sun, 15 Feb 2015 16:38:18 -0600
Subject: Some files that now include sys/time.h should no longer include
 timer.h

---
 apps/netutils/dhcpc/dhcpc.c          | 1 -
 apps/netutils/dnsclient/dns_socket.c | 1 -
 apps/netutils/tftpc/tftpc_packets.c  | 1 -
 nuttx/fs/vfs/fs_select.c             | 1 -
 nuttx/include/time.h                 | 2 +-
 nuttx/libc/time/lib_time.c           | 5 ++++-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/netutils/dhcpc/dhcpc.c b/apps/netutils/dhcpc/dhcpc.c
index 974618b38..7c42543bd 100644
--- a/apps/netutils/dhcpc/dhcpc.c
+++ b/apps/netutils/dhcpc/dhcpc.c
@@ -49,7 +49,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <unistd.h>
-#include <time.h>
 #include <errno.h>
 #include <debug.h>
 
diff --git a/apps/netutils/dnsclient/dns_socket.c b/apps/netutils/dnsclient/dns_socket.c
index eb09cd72a..ab635a330 100644
--- a/apps/netutils/dnsclient/dns_socket.c
+++ b/apps/netutils/dnsclient/dns_socket.c
@@ -53,7 +53,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <unistd.h>
-#include <time.h>
 #include <errno.h>
 #include <debug.h>
 #include <assert.h>
diff --git a/apps/netutils/tftpc/tftpc_packets.c b/apps/netutils/tftpc/tftpc_packets.c
index bf7aaef00..0c4a2fa11 100644
--- a/apps/netutils/tftpc/tftpc_packets.c
+++ b/apps/netutils/tftpc/tftpc_packets.c
@@ -46,7 +46,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
-#include <time.h>
 #include <errno.h>
 #include <debug.h>
 
diff --git a/nuttx/fs/vfs/fs_select.c b/nuttx/fs/vfs/fs_select.c
index 0edb8efbd..6edf2b7c3 100644
--- a/nuttx/fs/vfs/fs_select.c
+++ b/nuttx/fs/vfs/fs_select.c
@@ -44,7 +44,6 @@
 
 #include <string.h>
 #include <poll.h>
-#include <time.h>
 #include <errno.h>
 #include <assert.h>
 #include <debug.h>
diff --git a/nuttx/include/time.h b/nuttx/include/time.h
index c43385ace..5630b7958 100644
--- a/nuttx/include/time.h
+++ b/nuttx/include/time.h
@@ -190,7 +190,7 @@ int clock_getres(clockid_t clockid, FAR struct timespec *res);
 time_t mktime(FAR struct tm *tp);
 FAR struct tm *gmtime(FAR const time_t *timer);
 FAR struct tm *gmtime_r(FAR const time_t *timer, FAR struct tm *result);
-size_t strftime(char *s, size_t max, FAR const char *format,
+size_t strftime(FAR char *s, size_t max, FAR const char *format,
                 FAR const struct tm *tm);
 
 time_t time(FAR time_t *tloc);
diff --git a/nuttx/libc/time/lib_time.c b/nuttx/libc/time/lib_time.c
index c7c1a6565..21efb1428 100644
--- a/nuttx/libc/time/lib_time.c
+++ b/nuttx/libc/time/lib_time.c
@@ -39,9 +39,12 @@
 
 #include <nuttx/config.h>
 
-#include <sys/time.h>
 #include <time.h>
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
 /****************************************************************************
  * Function:  time
  *
-- 
cgit v1.2.3