Author: ngie
Date: Sat May 16 22:38:16 2015
New Revision: 283017
URL: https://svnweb.freebsd.org/changeset/base/283017
Log:
MFstable/10 r283016:
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/9/sbin/ifconfig/af_inet.c
Directory Properties:
stable/9/ (props changed)
stable/9/sbin/ (props changed)
stable/9/sbin/ifconfig/ (props changed)
Modified: stable/9/sbin/ifconfig/af_inet.c
==============================================================================
--- stable/9/sbin/ifconfig/af_inet.c Sat May 16 22:36:19 2015
(r283016)
+++ stable/9/sbin/ifconfig/af_inet.c Sat May 16 22:38:16 2015
(r283017)
@@ -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>
@@ -98,7 +98,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;
@@ -139,7 +138,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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
