From 84c79075fa2465e9d46ccae12f16e523c5c24e4b Mon Sep 17 00:00:00 2001
From: Miles Bader <miles@lsi.nec.co.jp>
Date: Mon, 22 Sep 2003 04:01:11 +0000
Subject: More fiddling with static free-areas: make sure both their size _and_
their alignment are correct.
---
libc/stdlib/malloc/heap.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libc/stdlib/malloc/heap.h b/libc/stdlib/malloc/heap.h
index 29a32c0bb..3dab65396 100644
--- a/libc/stdlib/malloc/heap.h
+++ b/libc/stdlib/malloc/heap.h
@@ -78,12 +78,12 @@ struct heap_free_area
#define HEAP_DECLARE_STATIC_FREE_AREA(name, size) \
static struct \
{ \
- HEAP_GRANULARITY_TYPE space[((size) \
- - sizeof (struct heap_free_area) \
- + (HEAP_GRANULARITY - 1)) \
- / HEAP_GRANULARITY]; \
+ HEAP_GRANULARITY_TYPE aligned_space; \
+ char space[HEAP_ADJUST_SIZE(size) \
+ - sizeof (struct heap_free_area) \
+ - HEAP_GRANULARITY]; \
struct heap_free_area _fa; \
- } name = { { (HEAP_GRANULARITY_TYPE)0 }, { (size), 0, 0 } }
+ } name = { (HEAP_GRANULARITY_TYPE)0, "", { HEAP_ADJUST_SIZE(size), 0, 0 } }
/* Rounds SZ up to be a multiple of HEAP_GRANULARITY. */
--
cgit v1.2.3