From be3edcf0ecf3bbd3cb172d0acd89b345aa4abb83 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Tue, 18 Jan 2022 21:59:29 +0000
Subject: [PATCH] Avoid pulling sys/param.h, by using _ALIGN instead.
 sys/time.h now gets NBBY and howmany() also ok guenther

---
 libexec/ld.so/malloc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libexec/ld.so/malloc.c b/libexec/ld.so/malloc.c
index 67d90adc206..be446e1c402 100644
--- a/libexec/ld.so/malloc.c
+++ b/libexec/ld.so/malloc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: malloc.c,v 1.34 2022/01/08 06:49:41 guenther Exp $       */
+/*      $OpenBSD: malloc.c,v 1.35 2022/01/18 21:59:29 deraadt Exp $       */
 /*
  * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net>
  * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -23,8 +23,9 @@
  * can buy me a beer in return. Poul-Henning Kamp
  */
 
-#include <sys/param.h>	/* ALIGN */
+#include <sys/types.h>
 #include <sys/queue.h>
+#include <sys/time.h>
 #include <sys/mman.h>
 #include <stdint.h>
 
@@ -536,7 +537,7 @@ alloc_chunk_info(struct dir_info *d, int bits)
 		size = sizeof(struct chunk_info) + (size - 1) * sizeof(u_short);
 		if (CHUNK_CANARIES)
 			size += count * sizeof(u_short);
-		size = ALIGN(size);
+		size = _ALIGN(size);
 
 		q = MMAP(MALLOC_PAGESIZE);
 		q = MMAP_ERROR(q);
-- 
2.20.1