You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/01/23 14:36:30 UTC
[incubator-nuttx-apps] branch master updated: Remove
CONFIG_TIME_EXTENDED conditioning
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new fd3775e Remove CONFIG_TIME_EXTENDED conditioning
fd3775e is described below
commit fd3775e0681756506d79799e386dcaa0f25353c8
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Jan 23 13:33:47 2020 +0800
Remove CONFIG_TIME_EXTENDED conditioning
Remove CONFIG_TIME_EXTENDED related stuff since kernel remove this option
---
netutils/thttpd/Kconfig | 1 -
nshlib/nsh_timcmds.c | 4 ----
2 files changed, 5 deletions(-)
diff --git a/netutils/thttpd/Kconfig b/netutils/thttpd/Kconfig
index 0b36c39..c714f0b 100644
--- a/netutils/thttpd/Kconfig
+++ b/netutils/thttpd/Kconfig
@@ -308,7 +308,6 @@ config THTTPD_TILDE_MAP2
config THTTPD_GENERATE_INDICES
bool "Generate name indices"
default n
- select TIME_EXTENDED
---help---
config THTTPD_USE_URLPATTERN
diff --git a/nshlib/nsh_timcmds.c b/nshlib/nsh_timcmds.c
index bbfb713..899fbc0 100644
--- a/nshlib/nsh_timcmds.c
+++ b/nshlib/nsh_timcmds.c
@@ -110,11 +110,7 @@ static inline int date_month(FAR const char *abbrev)
#ifndef CONFIG_NSH_DISABLE_DATE
static inline int date_showtime(FAR struct nsh_vtbl_s *vtbl, FAR const char *name)
{
-#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
static const char format[] = "%a, %b %d %H:%M:%S %Y";
-#else
- static const char format[] = "%b %d %H:%M:%S %Y";
-#endif
struct timespec ts;
struct tm tm;
char timbuf[MAX_TIME_STRING];