summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-08-05 04:56:37 +0000
committerMike Frysinger <vapier@gentoo.org>2006-08-05 04:56:37 +0000
commit82911dd00068e8978d0da4b44dd0fc4b833b8c72 (patch)
tree10f3ee96b82bb75e6f4ac5658971c68061e3e999
parent68d61aada26faf8ba03112af9c85b3f7fb769730 (diff)
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.
-rw-r--r--libc/stdlib/malloc/heap.h2
-rw-r--r--libc/stdlib/malloc/malloc.h2
2 files changed, 2 insertions, 2 deletions
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;