From 9eebc135cec7dcffbde280a41c678b983a05a1d1 Mon Sep 17 00:00:00 2001 From: kieranm Date: Wed, 18 Dec 2002 12:01:24 +0000 Subject: [PATCH] Removed dummy variable from "struct mem" and handled all MEM_ALIGNMENT cases Fixes bug #1912 --- src/core/mem.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core/mem.c b/src/core/mem.c index 34123ca1..2dc00ac2 100644 --- a/src/core/mem.c +++ b/src/core/mem.c @@ -50,11 +50,16 @@ struct mem { mem_size_t next, prev; +#if MEM_ALIGNMENT == 1 u8_t used; -#if MEM_ALIGNMENT == 2 - u8_t dummy; -#endif /* MEM_ALIGNEMNT == 2 */ -}; +#elif MEM_ALIGNMENT == 2 + u16_t used; +#elif MEM_ALIGNMENT == 4 + u32_t used; +#else +#error "unhandled MEM_ALIGNMENT size" +#endif /* MEM_ALIGNMENT */ +}; static struct mem *ram_end; static u8_t ram[MEM_SIZE + sizeof(struct mem) + MEM_ALIGNMENT];