From 84219641deedeefccd3eaf7d128e9136f4d814b3 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Wed, 1 May 2024 18:22:52 +0200 Subject: [PATCH] core: remove MIN() and MAX() macros All have been converted to std::min() and std::max(). Moreover, this was Windows only and since we cross-compile, it is not even clear if this is needed. Signed-off-by: Berthold Stoeger --- core/subsurface-string.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/core/subsurface-string.h b/core/subsurface-string.h index 79128fcce..6598deaa9 100644 --- a/core/subsurface-string.h +++ b/core/subsurface-string.h @@ -6,26 +6,6 @@ #include #include -// shared generic definitions and macros -// mostly about strings, but a couple of math macros are here as well - -/* Windows has no MIN/MAX macros - so let's just roll our own */ -#ifndef MIN -#define MIN(x, y) ({ \ - __typeof__(x) _min1 = (x); \ - __typeof__(y) _min2 = (y); \ - (void) (&_min1 == &_min2); \ - _min1 < _min2 ? _min1 : _min2; }) -#endif - -#ifndef MAX -#define MAX(x, y) ({ \ - __typeof__(x) _max1 = (x); \ - __typeof__(y) _max2 = (y); \ - (void) (&_max1 == &_max2); \ - _max1 > _max2 ? _max1 : _max2; }) -#endif - #ifdef __cplusplus extern "C" { #endif