[Scummvm-cvs-logs] scummvm master -> 4c89f4ac222142341292315afed7bfe70a929b66

dreammaster dreammaster at scummvm.org
Sat Aug 6 09:51:13 CEST 2011


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:
4c89f4ac22 TSAGE: Fix compilation on AmigaOS4


Commit: 4c89f4ac222142341292315afed7bfe70a929b66
    https://github.com/scummvm/scummvm/commit/4c89f4ac222142341292315afed7bfe70a929b66
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-08-06T00:48:37-07:00

Commit Message:
TSAGE: Fix compilation on AmigaOS4

Changed paths:
    engines/tsage/sound.cpp



diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 2121526..1d932fd 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -2792,7 +2792,7 @@ int AdlibSoundDriver::readBuffer(int16 *buffer, const int numSamples) {
 			}
 		}
 
-		int32 render = MIN(samplesLeft, _samplesTillCallback);
+		int32 render = MIN<int>(samplesLeft, _samplesTillCallback);
 		samplesLeft -= render;
 		_samplesTillCallback -= render;
 






More information about the Scummvm-git-logs mailing list