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/win95/bmpnames.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/win95/bmpnames.cpp') diff --git a/src/win95/bmpnames.cpp b/src/win95/bmpnames.cpp index b27e4ea..56c1282 100644 --- a/src/win95/bmpnames.cpp +++ b/src/win95/bmpnames.cpp @@ -1,3 +1,4 @@ +#include #include #include "bmpnames.hpp" #include "mishchnk.hpp" @@ -128,7 +129,7 @@ Chunk_With_BMPs::Chunk_With_BMPs (Chunk_With_Children * parent, const char * con bn.priority = d2; bn.transparency_colour_union = d3; - max_index = max (bn.index, max_index); + max_index = std::max(bn.index, max_index); bmps.add_entry (bn); } -- cgit v1.3