From 6a73a3cd2e4b55d6ad6a84fdcfc593841e0fb864 Mon Sep 17 00:00:00 2001
From: chopps <chopps@NetBSD.org>
Date: Tue, 31 May 1994 03:11:42 +0000
Subject: [PATCH] MIN/MAX->min/max

---
 sys/arch/amiga/dev/ite.c | 34 +++++++++++++++++-----------------
 sys/arch/amiga/dev/par.c |  6 +++---
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/sys/arch/amiga/dev/ite.c b/sys/arch/amiga/dev/ite.c
index 64cba2247db4..b86791627488 100644
--- a/sys/arch/amiga/dev/ite.c
+++ b/sys/arch/amiga/dev/ite.c
@@ -37,7 +37,7 @@
  *
  *      from: Utah Hdr: ite.c 1.1 90/07/09
  *      from: @(#)ite.c 7.6 (Berkeley) 5/16/91
- *	$Id: ite.c,v 1.17 1994/05/11 19:06:45 chopps Exp $
+ *	$Id: ite.c,v 1.18 1994/05/31 03:11:42 chopps Exp $
  */
 
 /*
@@ -951,7 +951,7 @@ ite_dnchar(ip, n)
      struct ite_softc *ip;
      int n;
 {
-  n = MIN(n, ip->cols - ip->curx);
+  n = min(n, ip->cols - ip->curx);
   if (n < ip->cols - ip->curx)
     {
       SUBR_SCROLL(ip, ip->cury, ip->curx + n, n, SCROLL_LEFT);
@@ -969,7 +969,7 @@ ite_inchar(ip, n)
      struct ite_softc *ip;
      int n;
 {
-  n = MIN(n, ip->cols - ip->curx);
+  n = min(n, ip->cols - ip->curx);
   if (n < ip->cols - ip->curx)
     {
       SUBR_SCROLL(ip, ip->cury, ip->curx, n, SCROLL_RIGHT);
@@ -999,7 +999,7 @@ static void inline
 ite_clrtobol(ip)
      struct ite_softc *ip;
 {
-  int y = ip->cury, x = MIN(ip->curx + 1, ip->cols);
+  int y = ip->cury, x = min(ip->curx + 1, ip->cols);
   SUBR_CLEAR(ip, y, 0, 1, x);
   attrclr(ip, y, 0, 1, x);
   SUBR_CURSOR(ip, DRAW_CURSOR);
@@ -1064,7 +1064,7 @@ ite_dnline(ip, n)
   if (ip->cury < ip->top_margin || ip->cury > ip->bottom_margin)
     return;
 
-  n = MIN(n, ip->bottom_margin + 1 - ip->cury);
+  n = min(n, ip->bottom_margin + 1 - ip->cury);
   if (n <= ip->bottom_margin - ip->cury)
     {
       SUBR_SCROLL(ip, ip->cury + n, 0, n, SCROLL_UP);
@@ -1086,7 +1086,7 @@ ite_inline(ip, n)
   if (ip->cury < ip->top_margin || ip->cury > ip->bottom_margin)
     return;
 
-  n = MIN(n, ip->bottom_margin + 1 - ip->cury);
+  n = min(n, ip->bottom_margin + 1 - ip->cury);
   if (n <= ip->bottom_margin - ip->cury)
     {
       SUBR_SCROLL(ip, ip->cury, 0, n, SCROLL_DOWN);
@@ -1667,7 +1667,7 @@ doesc:
 		    *ip->ap = 0;
 		    x = atoi (ip->argbuf);
 		    if (x) x--;
-		    ip->curx = MIN(x, ip->cols - 1);
+		    ip->curx = min(x, ip->cols - 1);
 		    ip->escape = 0;
 		    SUBR_CURSOR(ip, MOVE_CURSOR);
 		    clr_attr (ip, ATTR_INV);
@@ -1682,7 +1682,7 @@ doesc:
 		    if (y) y--;
 		    if (ip->inside_margins)
 		      y += ip->top_margin;
-		    ip->cury = MIN(y, ip->rows - 1);
+		    ip->cury = min(y, ip->rows - 1);
 		    ip->escape = 0;
 		    snap_cury(ip);
 		    SUBR_CURSOR(ip, MOVE_CURSOR);
@@ -1702,8 +1702,8 @@ doesc:
 		    if (y) y--;
 		    if (ip->inside_margins)
 		      y += ip->top_margin;
-		    ip->cury = MIN(y, ip->rows - 1);
-		    ip->curx = MIN(x, ip->cols - 1);
+		    ip->cury = min(y, ip->rows - 1);
+		    ip->curx = min(x, ip->cols - 1);
 		    ip->escape = 0;
 		    snap_cury(ip);
 		    SUBR_CURSOR(ip, MOVE_CURSOR);
@@ -1715,7 +1715,7 @@ doesc:
 		    n = ip->cury - (n ? n : 1);
 		    if (n < 0) n = 0;
 		    if (ip->inside_margins)
-		      n = MAX(ip->top_margin, n);
+		      n = max(ip->top_margin, n);
 		    else if (n == ip->top_margin - 1)
 		      /* allow scrolling outside region, but don't scroll out
 			 of active region without explicit CUP */
@@ -1729,9 +1729,9 @@ doesc:
 		  case 'B':
 		    n = ite_argnum (ip);
 		    n = ip->cury + (n ? n : 1);
-		    n = MIN(ip->rows - 1, n);
+		    n = min(ip->rows - 1, n);
 		    if (ip->inside_margins)
-		      n = MIN(ip->bottom_margin, n);
+		      n = min(ip->bottom_margin, n);
 		    else if (n == ip->bottom_margin + 1)
 		      /* allow scrolling outside region, but don't scroll out
 			 of active region without explicit CUP */
@@ -1745,7 +1745,7 @@ doesc:
 		  case 'C':
 		    n = ite_argnum (ip);
 		    n = n ? n : 1;
-		    ip->curx = MIN(ip->curx + n, ip->cols - 1);
+		    ip->curx = min(ip->curx + n, ip->cols - 1);
 		    ip->escape = 0;
 		    SUBR_CURSOR(ip, MOVE_CURSOR);
 		    clr_attr (ip, ATTR_INV);
@@ -1791,7 +1791,7 @@ doesc:
 
 		  case 'X':
 		    n = ite_argnum(ip) - 1;
-		    n = MIN(n, ip->cols - 1 - ip->curx);
+		    n = min(n, ip->cols - 1 - ip->curx);
 		    for (; n >= 0; n--)
 		      {
 			attrclr(ip, ip->cury, ip->curx + n, 1, 1);
@@ -1826,8 +1826,8 @@ doesc:
 		      }
 		    x--;
 		    y--;
-		    ip->top_margin = MIN(x, ip->rows - 1);
-		    ip->bottom_margin = MIN(y, ip->rows - 1);
+		    ip->top_margin = min(x, ip->rows - 1);
+		    ip->bottom_margin = min(y, ip->rows - 1);
 		    if (ip->inside_margins)
 		      {
 			ip->cury = ip->top_margin;
diff --git a/sys/arch/amiga/dev/par.c b/sys/arch/amiga/dev/par.c
index 6597b99017e0..bafa7c270c6e 100644
--- a/sys/arch/amiga/dev/par.c
+++ b/sys/arch/amiga/dev/par.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ppi.c	7.3 (Berkeley) 12/16/90
- *	$Id: par.c,v 1.7 1994/05/08 05:53:31 chopps Exp $
+ *	$Id: par.c,v 1.8 1994/05/31 03:11:44 chopps Exp $
  */
 
 /*
@@ -256,7 +256,7 @@ parrw(dev, uio)
 	   dev, uio, uio->uio_rw == UIO_READ ? 'R' : 'W',
 	   sc->sc_burst, sc->sc_timo, uio->uio_resid);
 #endif
-  buflen = MIN(sc->sc_burst, uio->uio_resid);
+  buflen = min(sc->sc_burst, uio->uio_resid);
   buf = (char *)malloc(buflen, M_DEVBUF, M_WAITOK);
   sc->sc_flags |= PARF_UIO;
   if (sc->sc_timo > 0) 
@@ -266,7 +266,7 @@ parrw(dev, uio)
     }
   while (uio->uio_resid > 0) 
     {
-      len = MIN(buflen, uio->uio_resid);
+      len = min(buflen, uio->uio_resid);
       cp = buf;
       if (uio->uio_rw == UIO_WRITE) 
 	{