From 8bacd281ba5156920f4b8cfa1da7520122beab78 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 14 Oct 2024 13:37:42 -0400
Subject: [PATCH] sys/param.h: Cleanup.

 * Minor tweaks to POSIX sys/param.h for style.

 * Don't redefine alignment macros in BSD sys/param.h even conditionally.
   And add a few more macros from the real BSD sys/param.h, for convenience.
   (Most of these are also declared in musl and glibc's sys/param.h)
---
 headers/compatibility/bsd/sys/param.h | 37 ++++++++++-----------------
 headers/posix/sys/param.h             | 13 ++++------
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/headers/compatibility/bsd/sys/param.h b/headers/compatibility/bsd/sys/param.h
index 7dd8308072..2535d8eee6 100644
--- a/headers/compatibility/bsd/sys/param.h
+++ b/headers/compatibility/bsd/sys/param.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2010 Haiku Inc. All Rights Reserved.
+ * Copyright 2006-2024, Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _BSD_SYS_PARAM_H_
@@ -13,34 +13,23 @@
 #ifdef _DEFAULT_SOURCE
 
 
-#ifndef _ALIGNBYTES
-#	define _ALIGNBYTES 7
-#endif
-#ifndef _ALIGN
-#	define _ALIGN(p) (((unsigned)(p) + _ALIGNBYTES) & ~_ALIGNBYTES)
-#endif
-
-#ifndef ALIGNBYTES
-#	define ALIGNBYTES _ALIGNBYTES
-#endif
-#ifndef ALIGN
-#	define ALIGN(p) _ALIGN(p)
-#endif
-
-#ifndef howmany
-#	define howmany(x, y) (((x) + ((y) - 1)) / (y))
-#endif
-
-#ifndef MAXLOGNAME
-#	define MAXLOGNAME 32
-#endif
-
+#define MAXLOGNAME 33
 #define NBBY 8
 
-#define nitems(x)	(sizeof((x)) / sizeof((x)[0]))
 
+#define ALIGNBYTES	_ALIGNBYTES
+#define ALIGN(p)	_ALIGN(p)
 
+#ifndef howmany
+#define	howmany(x, y)	(((x)+((y)-1))/(y))
 #endif
+#define nitems(x)	(sizeof((x)) / sizeof((x)[0]))
+#define roundup(x, y)	((((x)+((y)-1))/(y))*(y))
+#define rounddown(x, y)  (((x)/(y))*(y))
+#define powerof2(x)	((((x)-1)&(x))==0)
+
+
+#endif	/* _DEFAULT_SOURCE */
 
 
 #endif	/* _BSD_SYS_PARAM_H_ */
diff --git a/headers/posix/sys/param.h b/headers/posix/sys/param.h
index 3e5c2b0b66..a072674c7b 100644
--- a/headers/posix/sys/param.h
+++ b/headers/posix/sys/param.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 Haiku, Inc. All Rights Reserved.
+ * Copyright 2002-2024, Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _SYS_PARAM_H
@@ -9,11 +9,13 @@
 #include <limits.h>
 
 
+#define MAXHOSTNAMELEN	(256)		/* maximum possible length of this machine's hostname */
+
 #define MAXPATHLEN      PATH_MAX
 #define MAXSYMLINKS		SYMLOOP_MAX
-
 #define NOFILE          OPEN_MAX
 
+
 #ifndef MIN
 #	define MIN(a,b) (((a) < (b)) ? (a) : (b))
 #endif
@@ -22,12 +24,7 @@
 #endif
 
 #define _ALIGNBYTES	(sizeof(long) - 1)
-#define _ALIGN(p) \
-	(((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES)
+#define _ALIGN(p)	(((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES)
 
-/* maximum possible length of this machine's hostname */
-#ifndef MAXHOSTNAMELEN
-#	define MAXHOSTNAMELEN 256
-#endif
 
 #endif	/* _SYS_PARAM_H */