[PATCH 16/27 5.10.y] lib: zstd: drop local MIN/MAX macros in favor of generic ones

Eliav Farber posted 27 patches 1 week, 5 days ago
[PATCH 16/27 5.10.y] lib: zstd: drop local MIN/MAX macros in favor of generic ones
Posted by Eliav Farber 1 week, 5 days ago
Remove the MIN() and MAX() macros from zstd_internal.h to avoid
duplicate definitions now that the generic MIN() and MAX() macros
are available globally.

This change continues commit 1a251f52cfdc ("minmax: make generic MIN()
and MAX() macros available everywhere") and is required for 5.10.y,
where these macros did not exist in zstd_internal.h when the upstream
change was made.

Signed-off-by: Eliav Farber <farbere@amazon.com>
---
 lib/zstd/zstd_internal.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/zstd/zstd_internal.h b/lib/zstd/zstd_internal.h
index dac753397f86..927ed4e8c11c 100644
--- a/lib/zstd/zstd_internal.h
+++ b/lib/zstd/zstd_internal.h
@@ -36,8 +36,6 @@
 /*-*************************************
 *  shared macros
 ***************************************/
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
 #define CHECK_F(f)                       \
 	{                                \
 		size_t const errcod = f; \
-- 
2.47.3