diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1998-02-13 07:09:38 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1998-02-13 07:09:38 +0000 |
| commit | 5883bcc9d2838ef2d2989325bce04742cea13b59 (patch) | |
| tree | bc63ea943b26ad0516f8db4488ce4d5e4a9181d1 | |
| parent | 359888780eb5c0f750613b7de2e5d7faee92b685 (diff) | |
Notes
| -rw-r--r-- | sys/i386/isa/kbdio.c | 11 | ||||
| -rw-r--r-- | sys/isa/kbdio.c | 11 |
2 files changed, 8 insertions, 14 deletions
diff --git a/sys/i386/isa/kbdio.c b/sys/i386/isa/kbdio.c index b38201c39690..2d0131321fac 100644 --- a/sys/i386/isa/kbdio.c +++ b/sys/i386/isa/kbdio.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kbdio.c,v 1.10 1997/03/07 10:22:55 yokota Exp $ + * $Id: kbdio.c,v 1.11 1997/07/20 14:10:05 bde Exp $ */ #include "sc.h" @@ -76,16 +76,13 @@ /* constants */ -#define NKBDC max(max(NSC, NVT), NPSM) +#define NKBDC MAX(MAX(NSC, NVT), NPSM) #define KBDQ_BUFSIZE 32 /* macros */ -#ifndef max -#define max(x,y) ((x) > (y) ? (x) : (y)) -#endif -#ifndef min -#define min(x,y) ((x) < (y) ? (x) : (y)) +#ifndef MAX +#define MAX(x, y) ((x) > (y) ? (x) : (y)) #endif #define kbdcp(p) ((struct kbdc_softc *)(p)) diff --git a/sys/isa/kbdio.c b/sys/isa/kbdio.c index b38201c39690..2d0131321fac 100644 --- a/sys/isa/kbdio.c +++ b/sys/isa/kbdio.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kbdio.c,v 1.10 1997/03/07 10:22:55 yokota Exp $ + * $Id: kbdio.c,v 1.11 1997/07/20 14:10:05 bde Exp $ */ #include "sc.h" @@ -76,16 +76,13 @@ /* constants */ -#define NKBDC max(max(NSC, NVT), NPSM) +#define NKBDC MAX(MAX(NSC, NVT), NPSM) #define KBDQ_BUFSIZE 32 /* macros */ -#ifndef max -#define max(x,y) ((x) > (y) ? (x) : (y)) -#endif -#ifndef min -#define min(x,y) ((x) < (y) ? (x) : (y)) +#ifndef MAX +#define MAX(x, y) ((x) > (y) ? (x) : (y)) #endif #define kbdcp(p) ((struct kbdc_softc *)(p)) |