From 4f34db2d704b5c148523c5bbd0bdda59d3b97774 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Mon, 11 May 2015 04:54:56 +0000 Subject: [PATCH] Use MIN from sys/param.h instead of handrolling the macro Replace sys/types.h with sys/param.h per-style(9) MFC after: 3 days Sponsored by: EMC / Isilon Storage Division --- sbin/ifconfig/af_inet.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index 3c3a75742e10..eff1ce5958b9 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -32,7 +32,7 @@ static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ -#include +#include #include #include #include @@ -100,7 +100,6 @@ static struct sockaddr_in *sintab[] = { static void in_getaddr(const char *s, int which) { -#define MIN(a,b) ((a)<(b)?(a):(b)) struct sockaddr_in *sin = sintab[which]; struct hostent *hp; struct netent *np; @@ -141,7 +140,6 @@ in_getaddr(const char *s, int which) sin->sin_addr = inet_makeaddr(np->n_net, INADDR_ANY); else errx(1, "%s: bad value", s); -#undef MIN } static void