aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorRodney W. Grimes <rgrimes@FreeBSD.org>1994-05-26 13:30:20 +0000
committerRodney W. Grimes <rgrimes@FreeBSD.org>1994-05-26 13:30:20 +0000
commitd5d6e3f5d054448ef5a0e8a190e03057643fb4b4 (patch)
tree51c5fcfbfb4c1bdbae866f94f33d9f95bb94cc2c /sys
parent4eaaddb7ff076c91aeeac5d011b6e7cd1204dd5f (diff)
downloadsrc-d5d6e3f5d054448ef5a0e8a190e03057643fb4b4.tar.gz
src-d5d6e3f5d054448ef5a0e8a190e03057643fb4b4.zip
Fix some references to MIN() and MAX() that have been replaced by min() and
max().
Notes
Notes: svn path=/head/; revision=1567
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ie/if_ie.c2
-rw-r--r--sys/dev/mse/mse.c2
-rw-r--r--sys/i386/isa/if_el.c2
-rw-r--r--sys/i386/isa/if_ie.c2
-rw-r--r--sys/i386/isa/if_is.c2
-rw-r--r--sys/i386/isa/lpt.c2
-rw-r--r--sys/i386/isa/mse.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index cb6b96a6ab1b..d4e115569540 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -1104,7 +1104,7 @@ iestart(ifp)
}
m_freem(m0);
- len = MAX(len, ETHERMINLEN);
+ len = max(len, ETHERMINLEN);
#if NBPFILTER > 0
/*
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 5f80b21cc8f8..466e93635ea2 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -286,7 +286,7 @@ mseread(dev, uio)
sc->sc_bytesread = 0;
}
splx(s);
- xfer = MIN(uio->uio_resid, PROTOBYTES - sc->sc_bytesread);
+ xfer = min(uio->uio_resid, PROTOBYTES - sc->sc_bytesread);
if (error = uiomove(&sc->sc_bytes[sc->sc_bytesread], xfer, uio))
return (error);
sc->sc_bytesread += xfer;
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index d0de274baf73..a9033ec0b257 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -359,7 +359,7 @@ void el_start(struct ifnet *ifp)
}
m_freem(m0);
- len = MAX(len,ETHER_MIN_LEN);
+ len = max(len,ETHER_MIN_LEN);
/* Give the packet to the bpf, if any */
#if NBPFILTER > 0
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index cb6b96a6ab1b..d4e115569540 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -1104,7 +1104,7 @@ iestart(ifp)
}
m_freem(m0);
- len = MAX(len, ETHERMINLEN);
+ len = max(len, ETHERMINLEN);
#if NBPFILTER > 0
/*
diff --git a/sys/i386/isa/if_is.c b/sys/i386/isa/if_is.c
index 9f0e6ad4e09e..2df9bb4779e1 100644
--- a/sys/i386/isa/if_is.c
+++ b/sys/i386/isa/if_is.c
@@ -637,7 +637,7 @@ is_start(ifp)
m_freem(m0);
- len = MAX(len,ETHER_MIN_LEN);
+ len = max(len,ETHER_MIN_LEN);
/*
* Init transmit registers, and set transmit start flag.
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index 3317d12933da..88f492e34bfd 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -530,7 +530,7 @@ lptwrite(dev_t dev, struct uio * uio)
struct lpt_softc *sc = lpt_sc + LPTUNIT(minor(dev));
sc->sc_state &= ~INTERRUPTED;
- while (n = MIN(BUFSIZE, uio->uio_resid)) {
+ while (n = min(BUFSIZE, uio->uio_resid)) {
sc->sc_cp = sc->sc_inbuf->b_un.b_addr ;
uiomove(sc->sc_cp, n, uio);
sc->sc_xfercnt = n ;
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 5f80b21cc8f8..466e93635ea2 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -286,7 +286,7 @@ mseread(dev, uio)
sc->sc_bytesread = 0;
}
splx(s);
- xfer = MIN(uio->uio_resid, PROTOBYTES - sc->sc_bytesread);
+ xfer = min(uio->uio_resid, PROTOBYTES - sc->sc_bytesread);
if (error = uiomove(&sc->sc_bytes[sc->sc_bytesread], xfer, uio))
return (error);
sc->sc_bytesread += xfer;