From 1e38669119d4ce3e06bbad603799e32e6fd7feb2 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 12 Jun 2022 16:53:06 +0200 Subject: Replace max macro with std::max in C++ code Fixes compilation on Guix with gcc 12. Not sure which of those is relevant. --- src/fixer.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/fixer.h') diff --git a/src/fixer.h b/src/fixer.h index fff20c3..e239584 100644 --- a/src/fixer.h +++ b/src/fixer.h @@ -47,6 +47,7 @@ extern "C" { #define PACKED __attribute__((packed)) /* windows junk */ +#ifndef __cplusplus #ifndef min #define min(a, b) (((a) < (b)) ? (a) : (b)) #endif @@ -54,6 +55,7 @@ extern "C" { #ifndef max #define max(a, b) (((a) > (b)) ? (a) : (b)) #endif +#endif #define __cdecl -- cgit v1.3