Replace max macro with std::max in C++ code

Fixes compilation on Guix with gcc 12. Not sure which of those is
relevant.
This commit is contained in:
Timotej Lazar 2022-06-12 16:53:06 +02:00
parent 0aa9a623f3
commit 1e38669119
11 changed files with 70 additions and 53 deletions

View file

@ -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