summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2015-05-16 22:36:19 +0000
committerngie <ngie@FreeBSD.org>2015-05-16 22:36:19 +0000
commit31908b1bd52ae438a02b456f6e178780bf124a6b (patch)
tree841bc5d74039ccad8aeade1bb55a855ab194b35c
parent7de2980d9db755517d2f28f19f0f2c623b147e9a (diff)
downloadFreeBSD-src-31908b1bd52ae438a02b456f6e178780bf124a6b.zip
FreeBSD-src-31908b1bd52ae438a02b456f6e178780bf124a6b.tar.gz
MFC r282747:
Use MIN from sys/param.h instead of handrolling the macro Replace sys/types.h with sys/param.h per-style(9) Sponsored by: EMC / Isilon Storage Division
-rw-r--r--sbin/ifconfig/af_inet.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c
index c733373..e55aa88 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 <sys/types.h>
+#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <net/if.h>
@@ -101,7 +101,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;
@@ -142,7 +141,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
OpenPOWER on IntegriCloud