summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authoralfred <alfred@FreeBSD.org>2003-02-02 13:17:30 +0000
committeralfred <alfred@FreeBSD.org>2003-02-02 13:17:30 +0000
commitb5c0015ac9dfb47f49151ad199edb7f9f9665493 (patch)
tree373b34ef1d7f8eabfea9cac896b9dfe2b58a9879 /sys/contrib
parent81ccce55b8025295556c35e83be8657c6f4659ab (diff)
downloadFreeBSD-src-b5c0015ac9dfb47f49151ad199edb7f9f9665493.zip
FreeBSD-src-b5c0015ac9dfb47f49151ad199edb7f9f9665493.tar.gz
Consolidate MIN/MAX macros into one place (param.h).
Submitted by: Hiten Pandya <hiten@unixdaemons.com>
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/dev/oltr/if_oltr.c1
-rw-r--r--sys/contrib/ipfilter/netinet/ip_proxy.c4
2 files changed, 0 insertions, 5 deletions
diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c
index ea4dcc3..453fe75 100644
--- a/sys/contrib/dev/oltr/if_oltr.c
+++ b/sys/contrib/dev/oltr/if_oltr.c
@@ -92,7 +92,6 @@
#define PCI_VENDOR_OLICOM 0x108D
-#define MIN(A,B) (((A) < (B)) ? (A) : (B))
#define MIN3(A,B,C) (MIN(A, (MIN(B, C))))
char *AdapterName[] = {
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c
index 332835d..d612adf 100644
--- a/sys/contrib/ipfilter/netinet/ip_proxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_proxy.c
@@ -84,10 +84,6 @@ static const char rcsid[] = "@(#)$FreeBSD$";
extern KRWLOCK_T ipf_nat, ipf_state;
#endif
-#ifndef MIN
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#endif
-
static int appr_fixseqack __P((fr_info_t *, ip_t *, ap_session_t *, int ));
OpenPOWER on IntegriCloud