Author: ngie
Date: Mon May 11 04:54:56 2015
New Revision: 282747
URL: https://svnweb.freebsd.org/changeset/base/282747

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

Modified:
  head/sbin/ifconfig/af_inet.c

Modified: head/sbin/ifconfig/af_inet.c
==============================================================================
--- head/sbin/ifconfig/af_inet.c        Mon May 11 01:33:34 2015        
(r282746)
+++ head/sbin/ifconfig/af_inet.c        Mon May 11 04:54:56 2015        
(r282747)
@@ -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>
@@ -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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to