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:
Gregory Nutt
2015-11-25 12:51:45 -06:00
parent fb0a148812
commit e5f27f5865
9 changed files with 13 additions and 13 deletions
+2 -2
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 */
+2 -2
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 */
+2 -2
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 */
+2 -2
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 */
+1 -1
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':