sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some conditional compilation. CONFIG_LIBC_LOCALTIME should be checked in most of the same places wehre CONFIG_TIME_EXTENDED is checked

Browse Source
This commit is contained in:
Gregory Nutt 2015-11-25 12:51:45 -06:00
parent fb0a148812
commit e5f27f5865
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation

@ -1 +1 @@
Subproject commit 9ad99e6fed5b7b654ce805e6ec77f7d6287746b2
Subproject commit 197278585682ff0a7caee714f7706a0361b80144

2
arch

@ -1 +1 @@
Subproject commit 6e383188c0735cb0f813db3d5142541ffd80dad8
Subproject commit 6fa995b0aac7816b4250c41a737309417f6e2d1e

2
include/nuttx/timers/rtc.h
View File

@ -291,7 +291,7 @@ struct rtc_time
int tm_mday; /* Day of the month (1-31) */
int tm_mon; /* Month (0-11) */
int tm_year; /* Years since 1900 */
#ifdef CONFIG_LIBC_LOCALTIME
#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
int tm_wday; /* Day of the week (0-6) (unused) */
int tm_yday; /* Day of the year (0-365) (unused) */
int tm_isdst; /* Non-0 if daylight savings time is in effect (unused) */

2
include/time.h
View File

@ -205,7 +205,7 @@ FAR struct tm *localtime_r(FAR const time_t *timep, FAR struct tm *result);
size_t strftime(FAR char *s, size_t max, FAR const char *format,
FAR const struct tm *tm);
#ifdef CONFIG_TIME_EXTENDED
#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
FAR char *asctime(FAR const struct tm *tp);
FAR char *asctime_r(FAR const struct tm *tp, FAR char *buf);
FAR char *ctime(FAR const time_t *timep);

4
libc/time/lib_asctime.c
View File

@ -41,7 +41,7 @@
#include <time.h>
#ifdef CONFIG_TIME_EXTENDED
#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
/****************************************************************************
* Public Functions
@ -70,4 +70,4 @@ FAR char *asctime(FAR const struct tm *tp)
return asctime_r(tp, buf);
}
#endif /* CONFIG_TIME_EXTENDED */
#endif /* CONFIG_LIBC_LOCALTIME || CONFIG_TIME_EXTENDED */

4
libc/time/lib_asctimer.c
View File

@ -42,7 +42,7 @@
#include <stdio.h>
#include <time.h>
#ifdef CONFIG_TIME_EXTENDED
#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
/****************************************************************************
* Private Data
@ -94,4 +94,4 @@ FAR char *asctime_r(FAR const struct tm *tp, FAR char *buf)
return buf;
}
#endif /* CONFIG_TIME_EXTENDED */
#endif /* CONFIG_LIBC_LOCALTIME || CONFIG_TIME_EXTENDED */

4
libc/time/lib_ctime.c
View File

@ -41,7 +41,7 @@
#include <time.h>
#ifdef CONFIG_TIME_EXTENDED
#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
/****************************************************************************
* Public Functions
@ -79,4 +79,4 @@ FAR char *ctime(FAR const time_t *timep)
#endif
}
#endif /* CONFIG_TIME_EXTENDED */
#endif /* CONFIG_LIBC_LOCALTIME || CONFIG_TIME_EXTENDED */

4
libc/time/lib_ctimer.c
View File

@ -41,7 +41,7 @@
#include <time.h>
#ifdef CONFIG_TIME_EXTENDED
#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
/****************************************************************************
* Private Data
@ -80,4 +80,4 @@ FAR char *ctime_r(FAR const time_t *timep, FAR char *buf)
#endif
}
#endif /* CONFIG_TIME_EXTENDED */
#endif /* CONFIG_LIBC_LOCALTIME || CONFIG_TIME_EXTENDED */

2
libc/time/lib_strftime.c
View File

@ -181,7 +181,7 @@ size_t strftime(FAR char *s, size_t max, FAR const char *format,
switch (*format++)
{
#ifdef CONFIG_TIME_EXTENDED
#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
/* %a: A three-letter abbreviation for the day of the week. */
case 'a':