summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-02-15 16:38:18 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-02-15 16:38:18 -0600
commit2eba8afab5e8bdc32a0f6365de070eaa7f383149 (patch)
treebc50ff505e2c8113332d2f0efde87219788c08fe /nuttx
parent1169d36fd1d02c9c0432ee3317c4a749931c7f68 (diff)
downloadpx4-nuttx-2eba8afab5e8bdc32a0f6365de070eaa7f383149.tar.gz
px4-nuttx-2eba8afab5e8bdc32a0f6365de070eaa7f383149.tar.bz2
px4-nuttx-2eba8afab5e8bdc32a0f6365de070eaa7f383149.zip
Some files that now include sys/time.h should no longer include timer.h
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/fs/vfs/fs_select.c1
-rw-r--r--nuttx/include/time.h2
-rw-r--r--nuttx/libc/time/lib_time.c5
3 files changed, 5 insertions, 3 deletions
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,10 +39,13 @@
#include <nuttx/config.h>
-#include <sys/time.h>
#include <time.h>
/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
* Function: time
*
* Description: