diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2018-03-06 14:28:02 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2018-03-06 14:28:02 +0000 |
| commit | 21df2801ed7ea53b47b874bb076a6be24a48859f (patch) | |
| tree | f2e03a9cea8191992be5134793530b3dac684c0f | |
| parent | 2d1a1aebbe00aad403002b15f90835aec1aa8ded (diff) | |
use _ALIGN() which is uhm a bit OpenBSD-specific, but it means we
don't need to use sys/param.h at all, guess which one i believe is
greater namespace polution
ok otto
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 9843cab838e..90c49aa5389 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.246 2018/03/05 01:32:32 deraadt Exp $ */ +/* $OpenBSD: malloc.c,v 1.247 2018/03/06 14:28:01 deraadt Exp $ */ /* * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> @@ -26,7 +26,6 @@ /* #define MALLOC_STATS */ #include <sys/types.h> -#include <sys/param.h> /* PAGE_SHIFT ALIGN */ #include <sys/queue.h> #include <sys/mman.h> #include <sys/uio.h> @@ -833,7 +832,7 @@ alloc_chunk_info(struct dir_info *d, int bits) size = sizeof(struct chunk_info) + (size - 1) * sizeof(u_short); if (mopts.chunk_canaries) size += count * sizeof(u_short); - size = ALIGN(size); + size = _ALIGN(size); q = MMAP(MALLOC_PAGESIZE); if (q == MAP_FAILED) |