[Scummvm-cvs-logs] scummvm master -> 9a0e2b7ee7dc19af4894495234af5569031fd096

[lordhoto]

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:
9a0e2b7ee7 SCUMM: Fix compilation on AmigaOS4.


Commit: 9a0e2b7ee7dc19af4894495234af5569031fd096
    https://github.com/scummvm/scummvm/commit/9a0e2b7ee7dc19af4894495234af5569031fd096
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-12-14T12:18:56-08:00

Commit Message:
SCUMM: Fix compilation on AmigaOS4.

Changed paths:
    engines/scumm/player_mac.cpp



diff --git a/engines/scumm/player_mac.cpp b/engines/scumm/player_mac.cpp
index bbb97d3..c16c85b 100644
--- a/engines/scumm/player_mac.cpp
+++ b/engines/scumm/player_mac.cpp
@@ -346,7 +346,7 @@ int Player_Mac::readBuffer(int16 *data, const int numSamples) {
 					_channel[i]._remaining = samplesLeft;
 				}
 			}
-			generated = MIN(_channel[i]._remaining, samplesLeft);
+			generated = MIN<uint32>(_channel[i]._remaining, samplesLeft);
 			if (_channel[i]._velocity != 0) {
 				_channel[i]._instrument.generateSamples(ptr, _channel[i]._pitchModifier, _channel[i]._velocity, generated, _channel[i]._remaining, _fadeNoteEnds);
 			}