From 4f5ff37c5d6b7a5907c04a7e9e56bbcc4609324f Mon Sep 17 00:00:00 2001 From: sg Date: Mon, 25 Jul 2016 21:43:45 +0200 Subject: [PATCH] fixed bogus compiler error for MEM_USE_POOLS==1 and MEMP_USE_CUSTOM_POOLS==0 --- src/include/lwip/priv/memp_priv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/lwip/priv/memp_priv.h b/src/include/lwip/priv/memp_priv.h index 242b6d19..f246061d 100644 --- a/src/include/lwip/priv/memp_priv.h +++ b/src/include/lwip/priv/memp_priv.h @@ -97,7 +97,7 @@ struct memp { }; #endif /* !MEMP_MEM_MALLOC || MEMP_OVERFLOW_CHECK */ -#if MEM_USE_POOLS +#if MEM_USE_POOLS && MEMP_USE_CUSTOM_POOLS /* Use a helper type to get the start and end of the user "memory pools" for mem_malloc */ typedef enum { /* Get the first (via: @@ -124,7 +124,7 @@ typedef enum { We use this helper type and these defines so we can avoid using const memp_t values */ #define MEMP_POOL_FIRST ((memp_t) MEMP_POOL_HELPER_FIRST) #define MEMP_POOL_LAST ((memp_t) MEMP_POOL_HELPER_LAST) -#endif /* MEM_USE_POOLS */ +#endif /* MEM_USE_POOLS && MEMP_USE_CUSTOM_POOLS */ /** Memory pool descriptor */ struct memp_desc {