diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp index e7eef2737..30fdb38ad 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 ecc5dbf2b..447a81206 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