diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-24 09:04:28 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-24 09:04:28 -0600 |
| commit | c2c1de377b78099d90c911f1ed2279fc7f975af3 (patch) | |
| tree | 3857f421befcd83bec5417b4bd8474a98f2beee2 | |
| parent | 1f7a9bc3866322d088a4fe8fc0820e8c5effa44c (diff) | |
| download | nuttx-c2c1de377b78099d90c911f1ed2279fc7f975af3.tar.gz nuttx-c2c1de377b78099d90c911f1ed2279fc7f975af3.tar.bz2 nuttx-c2c1de377b78099d90c911f1ed2279fc7f975af3.zip | |
Fix another error in conditional compilation; plus some additional cosmetic changes
| -rw-r--r-- | apps/nshlib/nsh_netcmds.c | 2 | ||||
| -rw-r--r-- | nuttx/Kconfig | 14 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/ip.h | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c index 5540c66d8..5c4f2e748 100644 --- a/apps/nshlib/nsh_netcmds.c +++ b/apps/nshlib/nsh_netcmds.c @@ -292,7 +292,7 @@ static inline void net_statistics(FAR struct nsh_vtbl_s *vtbl) nsh_output(vtbl, " ICMP"); #endif #ifdef CONFIG_NET_ICMPv6 - nsh_output(vtbl, " ICMP6"); + nsh_output(vtbl, " ICMPv6"); #endif nsh_output(vtbl, "\n"); diff --git a/nuttx/Kconfig b/nuttx/Kconfig index 6f895eb0f..f81346f9e 100644 --- a/nuttx/Kconfig +++ b/nuttx/Kconfig @@ -390,10 +390,6 @@ config DEBUG Note that enabling this option by itself does not produce debug output. Debug output must also be selected on a subsystem-by-subsystem basis. -config ARCH_HAVE_STACKCHECK - bool - default n - config ARCH_HAVE_HEAPCHECK bool default n @@ -668,13 +664,19 @@ config DEBUG_WATCHDOG endif # DEBUG +config ARCH_HAVE_STACKCHECK + bool + default n + config STACK_COLORATION bool "Stack coloration" default n - depends on ARCH_HAVE_STACKCHECK && !DEBUG_STACK + depends on ARCH_HAVE_STACKCHECK ---help--- Enable stack coloration to initialize the stack memory to the value - of STACK_COLOR and use the stack checking API in a non debug build. + of STACK_COLOR and enable the stack checking APIs that can be used + to monitor the level of stack usage. + Only supported by a few architectures. config DEBUG_SYMBOLS diff --git a/nuttx/include/nuttx/net/ip.h b/nuttx/include/nuttx/net/ip.h index b3a5e29dd..ddf62fa35 100644 --- a/nuttx/include/nuttx/net/ip.h +++ b/nuttx/include/nuttx/net/ip.h @@ -175,7 +175,7 @@ struct ipv6_hdr_s #endif /* CONFIG_NET_IPv6 */ #ifdef CONFIG_NET_STATISTICS -#ifdef CONFIG_NET_IPv6 +#ifdef CONFIG_NET_IPv4 struct ipv4_stats_s { net_stats_t drop; /* Number of dropped packets at the IP layer */ |