svn commit: r283016 - stable/10/sbin/ifconfig

[Garrett Cooper]

Author: ngie
Date: Sat May 16 22:36:19 2015
New Revision: 283016
URL: https://svnweb.freebsd.org/changeset/base/283016

Log:
  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

Modified:
  stable/10/sbin/ifconfig/af_inet.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/ifconfig/af_inet.c
==============================================================================
--- stable/10/sbin/ifconfig/af_inet.c	Sat May 16 22:06:40 2015	(r283015)
+++ stable/10/sbin/ifconfig/af_inet.c	Sat May 16 22:36:19 2015	(r283016)
@@ -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