diff options
| author | Johannes Schickel | 2009-08-16 17:38:09 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-08-16 17:38:09 +0000 |
| commit | 582eb13fa2680a60ac5d1770c450fabfbc15a1b5 (patch) | |
| tree | 964a0ff419c3fd6b14bb605ba435eca1e8a0e208 | |
| parent | c88cf041a4b805f4af161630b37fa2a21d27e068 (diff) | |
| download | scummvm-rg350-582eb13fa2680a60ac5d1770c450fabfbc15a1b5.tar.gz scummvm-rg350-582eb13fa2680a60ac5d1770c450fabfbc15a1b5.tar.bz2 scummvm-rg350-582eb13fa2680a60ac5d1770c450fabfbc15a1b5.zip | |
Fix for bug #2838568 "AMIGAOS4: Compiler error in audiostream.cpp"
svn-id: r43447
| -rw-r--r-- | sound/audiostream.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index 8ea72851e2..57d2e097bf 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -277,7 +277,7 @@ int LinearDiskStream<stereo, is16Bit, isUnsigned, isLE>::readBuffer(int16 *buffe while (samples > 0 && ((_diskLeft > 0 || _bufferLeft > 0) || (_currentBlock != _audioBlockCount - 1)) ) { // Output samples in the buffer to the output - int len = MIN(samples, _bufferLeft); + int len = MIN<int>(samples, _bufferLeft); samples -= len; _bufferLeft -= len; |