From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Mon, 13 Feb 2017 22:03:57 +0000 (-0700)
Subject: avoid redefining the MIN macro
X-Git-Tag: SUDO_1_8_20^2~119
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6263cc55a58c1f946f9afe89ad2e136caf87ddff;p=sudo

avoid redefining the MIN macro
---

diff --git a/lib/zlib/deflate.c b/lib/zlib/deflate.c
index 1ec761448..1e39dcbae 100644
--- a/lib/zlib/deflate.c
+++ b/lib/zlib/deflate.c
@@ -1623,7 +1623,9 @@ local void fill_window(s)
 #define MAX_STORED 65535
 
 /* Minimum of a and b. */
+#ifndef MIN
 #define MIN(a, b) ((a) > (b) ? (b) : (a))
+#endif
 
 /* ===========================================================================
  * Copy without compression as much as possible from the input stream, return