From 82911dd00068e8978d0da4b44dd0fc4b833b8c72 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 5 Aug 2006 04:56:37 +0000 Subject: merge fix from blackfin cvs: bernds writes: Use __alignof__ instead of sizeof to get alignments. Eliminates some warnings about misalignments when malloc debugging is enabled. --- libc/stdlib/malloc/heap.h | 2 +- libc/stdlib/malloc/malloc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libc/stdlib/malloc') diff --git a/libc/stdlib/malloc/heap.h b/libc/stdlib/malloc/heap.h index ab1a73896..b66b5ecef 100644 --- a/libc/stdlib/malloc/heap.h +++ b/libc/stdlib/malloc/heap.h @@ -25,7 +25,7 @@ HEAP_GRANULARITY must be a power of 2. Malloc depends on this being the same as MALLOC_ALIGNMENT. */ #define HEAP_GRANULARITY_TYPE double -#define HEAP_GRANULARITY (sizeof (HEAP_GRANULARITY_TYPE)) +#define HEAP_GRANULARITY (__alignof__ (HEAP_GRANULARITY_TYPE)) /* A heap is a collection of memory blocks, from which smaller blocks diff --git a/libc/stdlib/malloc/malloc.h b/libc/stdlib/malloc/malloc.h index e722bc86a..b41c4b08e 100644 --- a/libc/stdlib/malloc/malloc.h +++ b/libc/stdlib/malloc/malloc.h @@ -12,7 +12,7 @@ */ /* The alignment we guarantee for malloc return values. */ -#define MALLOC_ALIGNMENT (sizeof (double)) +#define MALLOC_ALIGNMENT (__alignof__ (double)) /* The system pagesize... */ extern size_t __pagesize; -- cgit v1.2.3