From 1e38669119d4ce3e06bbad603799e32e6fd7feb2 Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@araneo.si>
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/inline.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/win95/inline.h')

diff --git a/src/win95/inline.h b/src/win95/inline.h
index dcb9dff..bfdcf8f 100644
--- a/src/win95/inline.h
+++ b/src/win95/inline.h
@@ -1,6 +1,7 @@
 #ifndef INLINE_INCLUDED
 #define INLINE_INCLUDED
 
+#ifndef __cplusplus
 #ifndef min
 #define min(a, b) (((a) < (b)) ? (a) : (b))
 #endif
@@ -8,6 +9,7 @@
 #ifndef max
 #define max(a, b) (((a) > (b)) ? (a) : (b))
 #endif
+#endif
 
 
 #if SUPPORT_MMX
-- 
cgit v1.3