From d84abfafc49119b449257a71b042b4e4c563b7df Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 24 Jan 2015 09:04:28 -0600 Subject: [PATCH] Fix another error in conditional compilation; plus some additional cosmetic changes --- Kconfig | 14 ++++++++------ include/nuttx/net/ip.h | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Kconfig b/Kconfig index 6f895eb0fc6..f81346f9ed8 100644 --- a/Kconfig +++ b/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/include/nuttx/net/ip.h b/include/nuttx/net/ip.h index b3a5e29dd4f..ddf62fa35ff 100644 --- a/include/nuttx/net/ip.h +++ b/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 */