From 8367feafa9dca03215fdd12b91d965391d4e6182 Mon Sep 17 00:00:00 2001 From: fbernon Date: Tue, 8 Jul 2008 09:15:56 +0000 Subject: [PATCH] stats.h: Fix some build bugs introduced with patch #6483 (missing some parameters in macros, mainly if MEM_STATS=0 and MEMP_STATS=0). --- CHANGELOG | 4 ++++ src/include/lwip/stats.h | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 41353daf..c953f3f0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -47,6 +47,10 @@ HISTORY ++ Bugfixes: + 2008-07-08 Frédéric Bernon + * stats.h: Fix some build bugs introduced with patch #6483 (missing some parameters + in macros, mainly if MEM_STATS=0 and MEMP_STATS=0). + 2008-06-24 Jonathan Larmour * tcp_in.c: Fix for bug #23693 as suggested by Art R. Ensure cseg is unused if tcp_seg_copy fails. diff --git a/src/include/lwip/stats.h b/src/include/lwip/stats.h index 7bf5af14..aa179f5c 100644 --- a/src/include/lwip/stats.h +++ b/src/include/lwip/stats.h @@ -154,6 +154,7 @@ extern struct stats_ lwip_stats; #define TCP_STATS_DISPLAY() stats_display_proto(&lwip_stats.tcp, "TCP") #else #define TCP_STATS_INC(x) +#define TCP_STATS_DISPLAY() #endif #if UDP_STATS @@ -223,10 +224,10 @@ extern struct stats_ lwip_stats; #define MEM_STATS_DEC_USED(x, y) lwip_stats.mem.x -= y #define MEM_STATS_DISPLAY() stats_display_mem(&lwip_stats.mem, "HEAP") #else -#define MEM_STATS_AVAIL(x) +#define MEM_STATS_AVAIL(x, y) #define MEM_STATS_INC(x) -#define MEM_STATS_INC_USED(x) -#define MEM_STATS_DEC_USED(x) +#define MEM_STATS_INC_USED(x, y) +#define MEM_STATS_DEC_USED(x, y) #define MEM_STATS_DISPLAY() #endif @@ -241,11 +242,11 @@ extern struct stats_ lwip_stats; } while(0) #define MEMP_STATS_DISPLAY(i) stats_display_memp(&lwip_stats.memp[i], i) #else -#define MEMP_STATS_AVAIL(x) -#define MEMP_STATS_INC(x) -#define MEMP_STATS_DEC(x) -#define MEMP_STATS_INC_USED(x) -#define MEMP_STATS_DISPLAY() +#define MEMP_STATS_AVAIL(x, i, y) +#define MEMP_STATS_INC(x, i) +#define MEMP_STATS_DEC(x, i) +#define MEMP_STATS_INC_USED(x, i) +#define MEMP_STATS_DISPLAY(i) #endif #if SYS_STATS