mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 16:50:55 +08:00
Fix some conditional compilation. CONFIG_LIBC_LOCALTIME should be checked in most of the same places wehre CONFIG_TIME_EXTENDED is checked
This commit is contained in:
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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':
|
||||
|
||||
Reference in New Issue
Block a user