From 86daf0cca62a97be81f25418c5bc87bd61f30ce5 Mon Sep 17 00:00:00 2001
From: alfred <alfred@FreeBSD.org>
Date: Sun, 2 Feb 2003 13:30:00 +0000
Subject: Catch more uses of MIN().

---
 sys/dev/hifn/hifn7751.c   | 2 --
 sys/i386/isa/tw.c         | 1 -
 sys/kern/uipc_usrreq.c    | 4 ----
 sys/netgraph/ng_device.c  | 3 ---
 sys/ufs/ufs/ufs_extattr.c | 2 --
 5 files changed, 12 deletions(-)

(limited to 'sys')

diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c
index 81762a8..6b6d9c6 100644
--- a/sys/dev/hifn/hifn7751.c
+++ b/sys/dev/hifn/hifn7751.c
@@ -1362,7 +1362,6 @@ hifn_init_dma(struct hifn_softc *sc)
 static u_int
 hifn_write_command(struct hifn_command *cmd, u_int8_t *buf)
 {
-#define	MIN(a,b)	((a)<(b)?(a):(b))
 	u_int8_t *buf_pos;
 	hifn_base_command_t *base_cmd;
 	hifn_mac_command_t *mac_cmd;
@@ -1456,7 +1455,6 @@ hifn_write_command(struct hifn_command *cmd, u_int8_t *buf)
 	}
 
 	return (buf_pos - buf);
-#undef	MIN
 }
 
 static int
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index f922813..9d50262 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -149,7 +149,6 @@
 #include <sys/selinfo.h>
 #include <sys/poll.h>
 #include <sys/bus.h>
-#define MIN(a,b)	((a)<(b)?(a):(b))
 
 #ifdef HIRESTIME
 #include <sys/time.h>
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 57b10ae..4b3693d3 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -1099,10 +1099,6 @@ unp_init(void)
 	LIST_INIT(&unp_shead);
 }
 
-#ifndef MIN
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-#endif
-
 static int
 unp_internalize(controlp, td)
 	struct mbuf **controlp;
diff --git a/sys/netgraph/ng_device.c b/sys/netgraph/ng_device.c
index 55c0606..956b7cf 100644
--- a/sys/netgraph/ng_device.c
+++ b/sys/netgraph/ng_device.c
@@ -99,9 +99,6 @@ struct ngd_softc {
 	char nodename[NG_NODELEN + 1];
 } ngd_softc;
 
-/* helper definition */
-#define		MIN(a, b)	((a) < (b) ? (a) : (b))
-
 /* the per connection receiving queue maximum */
 #define NGD_QUEUE_SIZE (1024*10)
 
diff --git a/sys/ufs/ufs/ufs_extattr.c b/sys/ufs/ufs/ufs_extattr.c
index 57d30e7..4d5ec66 100644
--- a/sys/ufs/ufs/ufs_extattr.c
+++ b/sys/ufs/ufs/ufs_extattr.c
@@ -66,8 +66,6 @@
 
 #ifdef UFS_EXTATTR
 
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-
 static MALLOC_DEFINE(M_UFS_EXTATTR, "ufs_extattr", "ufs extended attribute");
 
 static int ufs_extattr_sync = 0;
-- 
cgit v1.1