diff options
| author | Timotej Lazar <timotej.lazar@araneo.si> | 2022-06-12 16:53:06 +0200 |
|---|---|---|
| committer | Timotej Lazar <timotej.lazar@araneo.si> | 2022-06-12 16:53:06 +0200 |
| commit | 1e38669119d4ce3e06bbad603799e32e6fd7feb2 (patch) | |
| tree | e787ac4dac41be1f8bcdbeab22c3bbee64f0d8b7 /src/win95/inline.h | |
| parent | 0aa9a623f3b38e35b7f1cd26da0237beca2c9988 (diff) | |
Replace max macro with std::max in C++ code
Fixes compilation on Guix with gcc 12. Not sure which of those is
relevant.
Diffstat (limited to 'src/win95/inline.h')
| -rw-r--r-- | src/win95/inline.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 |