From 499b47780fe2983e1adaf3c3d27fd247030bb901 Mon Sep 17 00:00:00 2001
From: alfred <alfred@FreeBSD.org>
Date: Sun, 2 Feb 2003 13:52:25 +0000
Subject: chase more of the MIN/MAX mess. *sigh*

---
 sys/dev/syscons/rain/rain_saver.c | 3 +++
 sys/net/zlib.c                    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/sys/dev/syscons/rain/rain_saver.c b/sys/dev/syscons/rain/rain_saver.c
index bafd840..80e2212 100644
--- a/sys/dev/syscons/rain/rain_saver.c
+++ b/sys/dev/syscons/rain/rain_saver.c
@@ -41,6 +41,9 @@
 #include <dev/syscons/syscons.h>
 
 #define SAVER_NAME	 "rain_saver"
+#ifdef MAX
+#undef MAX
+#endif
 #define MAX		 63	/* number of colors (in addition to black) */
 #define INCREMENT	 4	/* increment between colors */
 
diff --git a/sys/net/zlib.c b/sys/net/zlib.c
index 9052c1f..e6e1286 100644
--- a/sys/net/zlib.c
+++ b/sys/net/zlib.c
@@ -56,6 +56,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/systm.h>
+#include <sys/param.h>
 #  define HAVE_MEMCPY
 
 #else
-- 
cgit v1.1