diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-22 02:42:47 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-22 02:42:47 +0000 |
| commit | a6624c7cb7f47281f01834c00d31322dfe9b16f2 (patch) | |
| tree | 8f9619816ca742397dc8ef00048607184c980a96 /libc/stdlib/malloc | |
| parent | 7eac2221e41a367288359189d4bc557ae367c01a (diff) | |
| download | uClibc-alpine-a6624c7cb7f47281f01834c00d31322dfe9b16f2.tar.bz2 uClibc-alpine-a6624c7cb7f47281f01834c00d31322dfe9b16f2.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/stdlib/malloc')
| -rw-r--r-- | libc/stdlib/malloc/heap.h | 2 | ||||
| -rw-r--r-- | libc/stdlib/malloc/malloc.h | 3 |
2 files changed, 2 insertions, 3 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 753205443..b41c4b08e 100644 --- a/libc/stdlib/malloc/malloc.h +++ b/libc/stdlib/malloc/malloc.h @@ -12,11 +12,10 @@ */ /* 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; -libc_hidden_proto(__pagesize) #define MALLOC_PAGE_SIZE __pagesize /* The minimum size of block we request from the the system to extend the |