From 3067049d5ce5871a58ca843afbe0edf32cdcfe1a Mon Sep 17 00:00:00 2001 From: Rosalie Wanders Date: Tue, 4 Feb 2025 18:39:41 +0100 Subject: [PATCH] 3rdParty: fix warning in mupen64plus-core --- Source/3rdParty/mupen64plus-core/src/main/util.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/3rdParty/mupen64plus-core/src/main/util.h b/Source/3rdParty/mupen64plus-core/src/main/util.h index ae88469e..c84c9511 100644 --- a/Source/3rdParty/mupen64plus-core/src/main/util.h +++ b/Source/3rdParty/mupen64plus-core/src/main/util.h @@ -185,8 +185,12 @@ struct xoshiro256pp_state xoshiro256pp_seed(uint64_t seed); uint64_t xoshiro256pp_next(struct xoshiro256pp_state* s); +#ifndef min #define min(a, b) ((a < b) ? a : b) +#endif +#ifndef max #define max(a, b) ((a < b) ? b : a) +#endif /********************** GUI utilities