From b9642c7349dd7af1833d3b2219914b1ec951d410 Mon Sep 17 00:00:00 2001
From: araujo <araujo@FreeBSD.org>
Date: Mon, 2 May 2016 01:49:42 +0000
Subject: [PATCH] Use MIN macro from sys/param.h.

MFC after:	2 weeks.
---
 usr.sbin/mountd/mountd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
index a9464f68fe48..e4b04b0d3e0b 100644
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -3171,7 +3171,7 @@ makemask(struct sockaddr_storage *ssp, int bitlen)
 		return (-1);
 
 	for (i = 0; i < len; i++) {
-		bits = (bitlen > CHAR_BIT) ? CHAR_BIT : bitlen;
+		bits = MIN(CHAR_BIT, bitlen);
 		*p++ = (u_char)~0 << (CHAR_BIT - bits);
 		bitlen -= bits;
 	}
-- 
2.41.0