From 058cfa972f2ce7b6bcae39d8a00ecdd7656d4815 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 20 Aug 2025 11:38:12 +0200 Subject: [PATCH] [macros] #ifndef MAX on some platforms the macro is part of the standard library, only define if not already there. --- libfreerdp/utils/test/TestEncodedTypes.c | 5 +++++ winpr/libwinpr/utils/collections/BufferPool.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/libfreerdp/utils/test/TestEncodedTypes.c b/libfreerdp/utils/test/TestEncodedTypes.c index 80eab107b..6ed82e835 100644 --- a/libfreerdp/utils/test/TestEncodedTypes.c +++ b/libfreerdp/utils/test/TestEncodedTypes.c @@ -25,8 +25,13 @@ #include #include +#ifndef MIN #define MIN(x, y) ((x) < (y)) ? (x) : (y) +#endif + +#ifndef MAX #define MAX(x, y) ((x) > (y)) ? (x) : (y) +#endif static BOOL test_signed_integer_read_write_equal(INT32 value) { diff --git a/winpr/libwinpr/utils/collections/BufferPool.c b/winpr/libwinpr/utils/collections/BufferPool.c index caf8a23bc..6513b714b 100644 --- a/winpr/libwinpr/utils/collections/BufferPool.c +++ b/winpr/libwinpr/utils/collections/BufferPool.c @@ -23,7 +23,9 @@ #include +#ifndef MAX #define MAX(a, b) ((a) > (b)) ? (a) : (b) +#endif typedef struct {