From 6263cc55a58c1f946f9afe89ad2e136caf87ddff Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Mon, 13 Feb 2017 15:03:57 -0700 Subject: [PATCH] avoid redefining the MIN macro --- lib/zlib/deflate.c | 2 ++ 1 file changed, 2 insertions(+) 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 -- 2.40.0