From c923d00340a333144f6f134330a57f8a10cd3c8e Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Wed, 14 Jun 2017 23:05:50 +0200 Subject: [PATCH] Fix bug #51238: LWIP_ARRAYSIZE() can't be used on lwip_cyclic_timers Add const int variable containing number of array elements --- src/core/timeouts.c | 1 + src/include/lwip/timeouts.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/timeouts.c b/src/core/timeouts.c index 8bf209a5..5d9c5cc7 100644 --- a/src/core/timeouts.c +++ b/src/core/timeouts.c @@ -105,6 +105,7 @@ const struct lwip_cyclic_timer lwip_cyclic_timers[] = { #endif /* LWIP_IPV6_MLD */ #endif /* LWIP_IPV6 */ }; +const int lwip_num_cyclic_timers = LWIP_ARRAYSIZE(lwip_cyclic_timers); #if LWIP_TIMERS && !LWIP_TIMERS_CUSTOM diff --git a/src/include/lwip/timeouts.h b/src/include/lwip/timeouts.h index c9b93aa0..002fcd45 100644 --- a/src/include/lwip/timeouts.h +++ b/src/include/lwip/timeouts.h @@ -71,8 +71,10 @@ struct lwip_cyclic_timer { }; /** This array contains all stack-internal cyclic timers. To get the number of - * timers, use LWIP_ARRAYSIZE() */ + * timers, use lwip_num_cyclic_timers */ extern const struct lwip_cyclic_timer lwip_cyclic_timers[]; +/** Array size of lwip_cyclic_timers[] */ +extern const int lwip_num_cyclic_timers; #if LWIP_TIMERS