[master] cd86bd0ce Rename roundup2() macro to rndup2() to not collide with what sys/param.h might have defined.

[Poul-Henning Kamp]

commit cd86bd0ce46d07b40bf767f6c3e64aaeb554b840
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Mar 29 19:36:57 2021 +0000

    Rename roundup2() macro to rndup2() to not collide with what sys/param.h might have defined.

diff --git a/lib/libvarnish/vsb.c b/lib/libvarnish/vsb.c
index 008ad2ce0..e868cade0 100644
--- a/lib/libvarnish/vsb.c
+++ b/lib/libvarnish/vsb.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD: head/sys/kern/subr_vsb.c 222004 2011-05-17 06:36:32Z phk $")
 #define	SBMALLOC(size)		malloc(size)
 #define	SBFREE(buf)		free(buf)
 
-#define	roundup2(x, y)	(((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
+#define	rndup2(x, y)	(((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
 
 /*
  * Predicates
@@ -127,7 +127,7 @@ VSB_extendsize(ssize_t size)
 		while (newsize < size)
 			newsize *= 2;
 	} else {
-		newsize = roundup2(size, VSB_MAXEXTENDINCR);
+		newsize = rndup2(size, VSB_MAXEXTENDINCR);
 	}
 	KASSERT(newsize >= size, ("%s: %d < %d\n", __func__, newsize, size));
 	return (newsize);