take MIN/MAX from param.h, okay theo@

15 files changed, 16 insertions, 56 deletions

diff --git a/sys/arch/alpha/pci/pcs_bus_io_common.c b/sys/arch/alpha/pci/pcs_bus_io_common.c
index 6d07d684a79..1ab25324fcf 100644
--- a/sys/arch/alpha/pci/pcs_bus_io_common.c
+++ b/sys/arch/alpha/pci/pcs_bus_io_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcs_bus_io_common.c,v 1.8 1997/07/07 07:15:41 niklas Exp $	*/
+/*	$OpenBSD: pcs_bus_io_common.c,v 1.9 2000/06/16 21:47:09 provos Exp $	*/
 /*	$NetBSD: pcs_bus_io_common.c,v 1.14 1996/12/02 22:19:35 cgd Exp $	*/
 
 /*
@@ -42,8 +42,6 @@
 #define	__C(A,B)	__CONCAT(A,B)
 #define	__S(S)		__STRING(S)
 
-#define MIN(x,y)	((x) < (y) ? (x) : (y))
-
 /* mapping/unmapping */
 int		__C(CHIP,_io_map) __P((void *, bus_addr_t, bus_size_t, int,
 		    bus_space_handle_t *));
diff --git a/sys/arch/alpha/pci/pcs_bus_mem_common.c b/sys/arch/alpha/pci/pcs_bus_mem_common.c
index ac6a817b57d..8105285795b 100644
--- a/sys/arch/alpha/pci/pcs_bus_mem_common.c
+++ b/sys/arch/alpha/pci/pcs_bus_mem_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcs_bus_mem_common.c,v 1.8 1997/07/19 20:44:15 niklas Exp $	*/
+/*	$OpenBSD: pcs_bus_mem_common.c,v 1.9 2000/06/16 21:47:10 provos Exp $	*/
 /*	$NetBSD: pcs_bus_mem_common.c,v 1.15 1996/12/02 22:19:36 cgd Exp $	*/
 
 /*
@@ -43,8 +43,6 @@
 #define	__C(A,B)	__CONCAT(A,B)
 #define	__S(S)		__STRING(S)
 
-#define MIN(x,y)	((x) < (y) ? (x) : (y))
-
 /* mapping/unmapping */
 int		__C(CHIP,_mem_map) __P((void *, bus_addr_t, bus_size_t, int,
 		    bus_space_handle_t *));
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 36a586fe985..6e343d1a2ad 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.133 2000/05/24 21:07:51 bjc Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.134 2000/06/16 21:47:11 provos Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -170,8 +170,6 @@ extern struct proc *npxproc;
 
 #include "bios.h"
 
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-
 /*
  * The following defines are for the code in setup_buffers that tries to
  * ensure that enough ISA DMAable memory is still left after the buffercache
diff --git a/sys/compat/linux/linux_resource.c b/sys/compat/linux/linux_resource.c
index 3a6a9860a08..37e3d2a8eeb 100644
--- a/sys/compat/linux/linux_resource.c
+++ b/sys/compat/linux/linux_resource.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_resource.c,v 1.1 2000/06/07 13:35:02 niklas Exp $	*/
+/*	$OpenBSD: linux_resource.c,v 1.2 2000/06/16 21:47:12 provos Exp $	*/
 
 /*
  * Copyright (c) 2000 Niklas Hallqvist
@@ -47,8 +47,6 @@
 #include <compat/linux/linux_signal.h>
 #include <compat/linux/linux_syscallargs.h>
 
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-
 /* linux_resource.c */
 int	linux_to_bsd_rlimit __P((u_int));
 int	linux_dogetrlimit __P((struct proc *, void *, register_t *, rlim_t));
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 *));
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 105ad19f43f..d7e328fc000 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_main.c,v 1.53 2000/06/05 11:02:50 art Exp $	*/
+/*	$OpenBSD: init_main.c,v 1.54 2000/06/16 21:47:14 provos Exp $	*/
 /*	$NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $	*/
 
 /*
@@ -105,10 +105,6 @@
 extern void nfs_init __P((void));
 #endif
 
-#ifndef MIN
-#define MIN(a,b)	(((a)<(b))?(a):(b))
-#endif
-
 char	copyright[] =
 "Copyright (c) 1982, 1986, 1989, 1991, 1993\n"
 "\tThe Regents of the University of California.  All rights reserved.\n"
diff --git a/sys/net/zlib.c b/sys/net/zlib.c
index 2bcbd381548..ebcdd8997fa 100644
--- a/sys/net/zlib.c
+++ b/sys/net/zlib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zlib.c,v 1.7 1997/02/24 13:34:06 niklas Exp $	*/
+/*	$OpenBSD: zlib.c,v 1.8 2000/06/16 21:47:14 provos Exp $	*/
 /*	$NetBSD: zlib.c,v 1.2 1996/03/16 23:55:40 christos Exp $	*/
 
 /*
@@ -33,6 +33,7 @@
 
 #include "zlib.h"
 
+#include <sys/param.h>
 #include <sys/types.h>
 #ifdef _STANDALONE
 #include <stand.h>
@@ -1672,7 +1673,6 @@ local void send_bits(s, value, length)
 #endif /* DEBUG_ZLIB */
 
 
-#define MAX(a,b) (a >= b ? a : b)
 /* the arguments must not have side effects */
 
 /* ===========================================================================
diff --git a/sys/netatalk/ddp_output.c b/sys/netatalk/ddp_output.c
index 5e75c985881..524b0a946b5 100644
--- a/sys/netatalk/ddp_output.c
+++ b/sys/netatalk/ddp_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ddp_output.c,v 1.1 1997/07/23 03:39:54 denny Exp $	*/
+/*	$OpenBSD: ddp_output.c,v 1.2 2000/06/16 21:47:15 provos Exp $	*/
 
 /*
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -92,8 +92,6 @@
 #include <netatalk/ddp_var.h>
 #include <netatalk/at_extern.h>
 
-#define MIN(a,b) (((a)<(b))?(a):(b))
-
 int ddp_output	__P(( struct mbuf *, ... ));
 u_int16_t at_cksum	__P(( struct mbuf *, int ));
 int ddp_route	__P((struct mbuf *, struct route * ));
diff --git a/sys/netinet/ip_fil_compat.h b/sys/netinet/ip_fil_compat.h
index e823666e1a6..d9c078e47e3 100644
--- a/sys/netinet/ip_fil_compat.h
+++ b/sys/netinet/ip_fil_compat.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_fil_compat.h,v 1.16 2000/05/01 06:16:47 kjell Exp $	*/
+/*	$OpenBSD: ip_fil_compat.h,v 1.17 2000/06/16 21:47:16 provos Exp $	*/
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
@@ -149,10 +149,6 @@ typedef unsigned long   u_32_t;
 # endif
 #endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ || __sgi */
 
-#ifndef	MAX
-#define	MAX(a,b)	(((a) > (b)) ? (a) : (b))
-#endif
-
 /*
  * Security Options for Intenet Protocol (IPSO) as defined in RFC 1108.
  *
diff --git a/sys/netinet/ip_proxy.c b/sys/netinet/ip_proxy.c
index 2184909d792..871183209f1 100644
--- a/sys/netinet/ip_proxy.c
+++ b/sys/netinet/ip_proxy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_proxy.c,v 1.9 2000/04/05 05:35:27 kjell Exp $	*/
+/*	$OpenBSD: ip_proxy.c,v 1.10 2000/06/16 21:47:16 provos Exp $	*/
 
 /*
  * Copyright (C) 1997-1998 by Darren Reed.
@@ -80,11 +80,6 @@ static const char rcsid[] = "@(#)$IPFilter: ip_proxy.c,v 2.2.2.4 2000/03/15 13:5
 # include <sys/malloc.h>
 #endif
 
-
-#ifndef MIN
-#define MIN(a,b)        (((a)<(b))?(a):(b))
-#endif
-
 static ap_session_t *appr_new_session __P((aproxy_t *, ip_t *,
 					   fr_info_t *, nat_t *));
 static int appr_fixseqack __P((fr_info_t *, ip_t *, ap_session_t *, int ));
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index f0810e46125..f8f2e44caea 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6.c,v 1.16 2000/05/19 13:55:17 itojun Exp $	*/
+/*	$OpenBSD: nd6.c,v 1.17 2000/06/16 21:47:17 provos Exp $	*/
 /*	$KAME: nd6.c,v 1.63 2000/05/17 12:35:59 jinmei Exp $	*/
 
 /*
@@ -182,7 +182,6 @@ void
 nd6_setmtu(ifp)
 	struct ifnet *ifp;
 {
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
 	struct nd_ifinfo *ndi = &nd_ifinfo[ifp->if_index];
 	u_long oldmaxmtu = ndi->maxmtu;
 	u_long oldlinkmtu = ndi->linkmtu;
diff --git a/sys/netiso/xebec/malloc.c b/sys/netiso/xebec/malloc.c
index 191e69d996b..c977c4eb62e 100644
--- a/sys/netiso/xebec/malloc.c
+++ b/sys/netiso/xebec/malloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malloc.c,v 1.2 1996/03/04 10:37:12 mickey Exp $	*/
+/*	$OpenBSD: malloc.c,v 1.3 2000/06/16 21:47:18 provos Exp $	*/
 /*	$NetBSD: malloc.c,v 1.4 1994/06/29 06:41:10 cgd Exp $	*/
 
 /*
@@ -46,8 +46,6 @@ char *s;
 	ENDDEBUG
 }
 
-#define MIN(x,y) ((x<y)?x:y)
-
 char *Malloc(x)
 int x;
 {
diff --git a/sys/scsi/ss.c b/sys/scsi/ss.c
index 55e656777df..04ad9ab012f 100644
--- a/sys/scsi/ss.c
+++ b/sys/scsi/ss.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ss.c,v 1.40 1999/05/11 23:57:44 kstailey Exp $	*/
+/*	$OpenBSD: ss.c,v 1.41 2000/06/16 21:47:19 provos Exp $	*/
 /*	$NetBSD: ss.c,v 1.10 1996/05/05 19:52:55 christos Exp $	*/
 
 /*
@@ -54,8 +54,6 @@
 #define SSMODE(z)	( minor(z)       & 0x03)
 #define SSUNIT(z)	((minor(z) >> 4)       )
 
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-
 /*
  * If the mode is 3 (e.g. minor = 3,7,11,15)
  * then the device has been openned to set defaults
diff --git a/sys/sys/param.h b/sys/sys/param.h
index cf5a9418cdd..aec326f0f3a 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.28 2000/04/08 05:06:24 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.29 2000/06/16 21:47:19 provos Exp $	*/
 /*	$NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $	*/
 
 /*-
@@ -191,10 +191,8 @@
 #define powerof2(x)	((((x)-1)&(x))==0)
 
 /* Macros for min/max. */
-#ifndef _KERNEL
 #define	MIN(a,b) (((a)<(b))?(a):(b))
 #define	MAX(a,b) (((a)>(b))?(a):(b))
-#endif
 
 /*
  * Constants for setting the parameters of the kernel memory allocator.