From ba8c6d816926f1756b95554a7c520e3455f6bbab Mon Sep 17 00:00:00 2001 From: tildearrow Date: Mon, 17 May 2021 19:18:59 -0500 Subject: [PATCH] it builds on GCC again --- src/engine/playback.cpp | 2 +- src/ta-utils.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp index e7eef273..30fdb38a 100644 --- a/src/engine/playback.cpp +++ b/src/engine/playback.cpp @@ -134,7 +134,7 @@ void DivEngine::processRow(int i, bool afterDelay) { // volume if (pat->data[curRow][3]!=-1) { - if ((min(chan[i].volMax,chan[i].volume)>>8)!=pat->data[curRow][3]) { + if ((MIN(chan[i].volMax,chan[i].volume)>>8)!=pat->data[curRow][3]) { chan[i].volume=pat->data[curRow][3]<<8; dispatch->dispatch(DivCommand(DIV_CMD_VOLUME,i,chan[i].volume>>8)); } diff --git a/src/ta-utils.h b/src/ta-utils.h index ecc5dbf2..447a8120 100644 --- a/src/ta-utils.h +++ b/src/ta-utils.h @@ -6,7 +6,7 @@ typedef std::string String; -#define min(a,b) (((a)<(b))?(a):(b)) -#define max(a,b) (((a)>(b))?(a):(b)) +#define MIN(a,b) (((a)<(b))?(a):(b)) +#define MAX(a,b) (((a)>(b))?(a):(b)) #endif