From 741cff4d9dd191d4ac99ae2118388e734b14dcb2 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Wed, 30 Jul 2003 00:20:41 +0000
Subject: [PATCH] LINT synchronization, remove remaining manually defined MIN
 macros.

---
 sys/dev/crypto/hifn/hifn7751.c | 3 +--
 sys/dev/misc/tw/tw.c           | 3 +--
 sys/dev/sound/pcm/buffer.c     | 6 ++----
 sys/dev/sound/pcm/channel.c    | 5 ++---
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/sys/dev/crypto/hifn/hifn7751.c b/sys/dev/crypto/hifn/hifn7751.c
index e22a245afe..9647eb1efc 100644
--- a/sys/dev/crypto/hifn/hifn7751.c
+++ b/sys/dev/crypto/hifn/hifn7751.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.5.2.5 2003/06/04 17:56:59 sam Exp $ */
-/* $DragonFly: src/sys/dev/crypto/hifn/hifn7751.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ */
+/* $DragonFly: src/sys/dev/crypto/hifn/hifn7751.c,v 1.3 2003/07/30 00:20:38 dillon Exp $ */
 /*	$OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $	*/
 
 /*
@@ -1392,7 +1392,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;
diff --git a/sys/dev/misc/tw/tw.c b/sys/dev/misc/tw/tw.c
index 04c5636754..f4ca0dfa7e 100644
--- a/sys/dev/misc/tw/tw.c
+++ b/sys/dev/misc/tw/tw.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/tw.c,v 1.38 2000/01/29 16:00:32 peter Exp $
- * $DragonFly: src/sys/dev/misc/tw/tw.c,v 1.6 2003/07/23 02:30:19 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/tw/tw.c,v 1.7 2003/07/30 00:20:41 dillon Exp $
  *
  */
 
@@ -149,7 +149,6 @@
 #include <sys/syslog.h>
 #include <sys/select.h>
 #include <sys/poll.h>
-#define MIN(a,b)	((a)<(b)?(a):(b))
 
 #ifdef HIRESTIME
 #include <sys/time.h>
diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c
index 8c9038f210..a0d25abcc2 100644
--- a/sys/dev/sound/pcm/buffer.c
+++ b/sys/dev/sound/pcm/buffer.c
@@ -24,16 +24,14 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sound/pcm/buffer.c,v 1.1.2.4 2002/04/22 15:49:35 cg Exp $
- * $DragonFly: src/sys/dev/sound/pcm/buffer.c,v 1.2 2003/06/17 04:28:31 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pcm/buffer.c,v 1.3 2003/07/30 00:20:39 dillon Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/buffer.c,v 1.2 2003/06/17 04:28:31 dillon Exp $");
-
-#define	MIN(x, y) (((x) < (y))? (x) : (y))
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/buffer.c,v 1.3 2003/07/30 00:20:39 dillon Exp $");
 
 #define SNDBUF_NAMELEN	48
 struct snd_dbuf {
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index a492b81b7c..af5e8d6c91 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -25,20 +25,19 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sound/pcm/channel.c,v 1.19.2.19 2003/03/11 15:15:41 orion Exp $
- * $DragonFly: src/sys/dev/sound/pcm/channel.c,v 1.4 2003/07/19 21:14:29 dillon Exp $
+ * $DragonFly: src/sys/dev/sound/pcm/channel.c,v 1.5 2003/07/30 00:20:39 dillon Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/channel.c,v 1.4 2003/07/19 21:14:29 dillon Exp $");
+SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/channel.c,v 1.5 2003/07/30 00:20:39 dillon Exp $");
 
 #define MIN_CHUNK_SIZE 		256	/* for uiomove etc. */
 #define	DMA_ALIGN_THRESHOLD	4
 #define	DMA_ALIGN_MASK		(~(DMA_ALIGN_THRESHOLD - 1))
 
-#define	MIN(x, y) (((x) < (y))? (x) : (y))
 #define CANCHANGE(c) (!(c->flags & CHN_F_TRIGGERED))
 
 /*
-- 
2.41.0