[Scummvm-git-logs] scummvm master -> b7e3a807e81420cc8d0ea482af9748f2f99b0c73

[ccawley2011]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b7e3a807e8 AUDIO: Fix compilation on DS and OpenPandora


Commit: b7e3a807e81420cc8d0ea482af9748f2f99b0c73
    https://github.com/scummvm/scummvm/commit/b7e3a807e81420cc8d0ea482af9748f2f99b0c73
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-08-09T16:19:16+01:00

Commit Message:
AUDIO: Fix compilation on DS and OpenPandora

Changed paths:
    audio/soundfont/vgmcoll.cpp


diff --git a/audio/soundfont/vgmcoll.cpp b/audio/soundfont/vgmcoll.cpp
index 5b0ea94259..0a893c82bc 100644
--- a/audio/soundfont/vgmcoll.cpp
+++ b/audio/soundfont/vgmcoll.cpp
@@ -36,7 +36,7 @@ double ConvertLogScaleValToAtten(double percent) {
 	if (percent == 0)
 		return 100.0;  // assume 0 is -100.0db attenuation
 	double atten = 20 * log10(percent) * 2;
-	return MIN(-atten, 100.0);
+	return MIN<double>(-atten, 100.0);
 }
 
 // Convert a percent of volume value to it's attenuation in decibels.
@@ -45,7 +45,7 @@ double ConvertPercentAmplitudeToAttenDB_SF2(double percent) {
 	if (percent == 0)
 		return 100.0;  // assume 0 is -100.0db attenuation
 	double atten = 20 * log10(percent);
-	return MIN(-atten, 100.0);
+	return MIN<double>(-atten, 100.0);
 }
 
 void VGMColl::UnpackSampColl(SynthFile &synthfile, VGMSampColl *sampColl,