jcs's openbsd hax
openbsd

Avoid pulling sys/param.h, by using _ALIGN instead. sys/time.h now gets NBBY and howmany() also ok guenther

deraadt be3edcf0 24e38e2f

+4 -3
+4 -3
libexec/ld.so/malloc.c
··· 1 - /* $OpenBSD: malloc.c,v 1.34 2022/01/08 06:49:41 guenther Exp $ */ 1 + /* $OpenBSD: malloc.c,v 1.35 2022/01/18 21:59:29 deraadt Exp $ */ 2 2 /* 3 3 * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net> 4 4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> ··· 23 23 * can buy me a beer in return. Poul-Henning Kamp 24 24 */ 25 25 26 - #include <sys/param.h> /* ALIGN */ 26 + #include <sys/types.h> 27 27 #include <sys/queue.h> 28 + #include <sys/time.h> 28 29 #include <sys/mman.h> 29 30 #include <stdint.h> 30 31 ··· 536 537 size = sizeof(struct chunk_info) + (size - 1) * sizeof(u_short); 537 538 if (CHUNK_CANARIES) 538 539 size += count * sizeof(u_short); 539 - size = ALIGN(size); 540 + size = _ALIGN(size); 540 541 541 542 q = MMAP(MALLOC_PAGESIZE); 542 543 q = MMAP_ERROR(q);