Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-10-03 20:27:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge in from master

Browse source
This commit is contained in:
Gregory Nutt 2015-04-21 09:32:19 -06:00
commit 6b27c48068
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -10259,4 +10259,5 @@
https://github.com/kaushalparikh/nuttx (2015-04-19).
* drivers/usbhost/usbhost_enumerate.c: Last of USB hub logic from
https://github.com/kaushalparikh/nuttx (2015-04-19).
* include/time.h: Add prototypes for localtime() and localtimer_r()
(2015-04-21).

8
include/time.h
View file

@ -96,8 +96,8 @@
#ifndef CONFIG_LIBC_LOCALTIME
/* Local time is the same as gmtime in this implementation */
#define localtime(c) gmtime(c)
#define localtime_r(c,r) gmtime_r(c,r)
# define localtime(c) gmtime(c)
# define localtime_r(c,r) gmtime_r(c,r)
#endif
/********************************************************************************
@ -196,6 +196,10 @@ 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);
#ifdef CONFIG_LIBC_LOCALTIME
FAR struct tm *localtime(FAR const time_t *timer);
FAR struct tm *localtime_r(FAR const time_t *timer, FAR struct tm *result);
#endif
size_t strftime(FAR char *s, size_t max, FAR const char *format,
FAR const struct tm *tm);