summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralfred <alfred@FreeBSD.org>2003-02-02 13:52:25 +0000
committeralfred <alfred@FreeBSD.org>2003-02-02 13:52:25 +0000
commit499b47780fe2983e1adaf3c3d27fd247030bb901 (patch)
treed16507fe955fcfc2b063496fff2b0b3f3280e4a4
parent86daf0cca62a97be81f25418c5bc87bd61f30ce5 (diff)
downloadFreeBSD-src-499b47780fe2983e1adaf3c3d27fd247030bb901.zip
FreeBSD-src-499b47780fe2983e1adaf3c3d27fd247030bb901.tar.gz
chase more of the MIN/MAX mess. *sigh*
-rw-r--r--sys/dev/syscons/rain/rain_saver.c3
-rw-r--r--sys/net/zlib.c1
2 files changed, 4 insertions, 0 deletions
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
OpenPOWER on IntegriCloud