summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorNiels Provos <provos@cvs.openbsd.org>2000-06-16 21:47:20 +0000
committerNiels Provos <provos@cvs.openbsd.org>2000-06-16 21:47:20 +0000
commit73501d656ca05164437c542734297118885750b9 (patch)
tree67425e428d72378b157a1a44f8f1839fddf27877 /sys/dev/ic
parent5042942398fd5fe3553c7eb71e912f3412f22eb5 (diff)
take MIN/MAX from param.h, okay theo@
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/aic7xxxvar.h10
-rw-r--r--sys/dev/ic/gdt_common.c4
2 files changed, 2 insertions, 12 deletions
diff --git a/sys/dev/ic/aic7xxxvar.h b/sys/dev/ic/aic7xxxvar.h
index ae510913bec..0bd400f3ad2 100644
--- a/sys/dev/ic/aic7xxxvar.h
+++ b/sys/dev/ic/aic7xxxvar.h
@@ -31,20 +31,12 @@
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.15 2000/01/07 23:08:18 gibbs Exp $
- * $OpenBSD: aic7xxxvar.h,v 1.11 2000/03/22 02:48:47 smurph Exp $
+ * $OpenBSD: aic7xxxvar.h,v 1.12 2000/06/16 21:47:13 provos Exp $
*/
#ifndef _AIC7XXXVAR_H_
#define _AIC7XXXVAR_H_
-#ifndef MAX
-#define MAX(a,b) (((a) > (b)) ? (a) : (b))
-#endif
-
-#ifndef MIN
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-
#ifndef FALSE
#define FALSE 0
#endif
diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c
index ac5e0c33ed2..50398cb36e6 100644
--- a/sys/dev/ic/gdt_common.c
+++ b/sys/dev/ic/gdt_common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gdt_common.c,v 1.5 2000/03/01 22:38:51 niklas Exp $ */
+/* $OpenBSD: gdt_common.c,v 1.6 2000/06/16 21:47:13 provos Exp $ */
/*
* Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved.
@@ -53,8 +53,6 @@
#include <dev/ic/gdtreg.h>
#include <dev/ic/gdtvar.h>
-#define MIN(x, y) (((x) < (y)) ? (x) : (y))
-
int gdt_async_event __P((struct gdt_softc *, int));
void gdt_chain __P((struct gdt_softc *));
void gdt_clear_events __P((struct gdt_softc *));