[Scummvm-cvs-logs] CVS: scummvm/sound audiostream.cpp,1.14,1.15 rate.cpp,1.10,1.11
Pawel Kolodziejski
aquadran at users.sourceforge.net
Thu Jul 31 11:36:03 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/common scummsys.h,1.33,1.34 stdafx.h,1.10,1.11
- Next message: [Scummvm-cvs-logs] CVS: scummvm bs2.dsp,NONE,1.1 scumm.dsp,1.44,1.45 scummvm.dsp,1.50,1.51 scummvm.dsw,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv12119/sound
Modified Files:
audiostream.cpp rate.cpp
Log Message:
back disable warnings into stdafx.h, vc6 is lack of warnings support
Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- audiostream.cpp 31 Jul 2003 06:47:05 -0000 1.14
+++ audiostream.cpp 31 Jul 2003 18:35:01 -0000 1.15
@@ -26,11 +26,6 @@
#include "common/file.h"
#include "common/util.h"
-#ifdef _MSC_VER
-// Disable "unknown pragma" warning in MSVC 6
-#pragma warning(disable : 4068)
-#endif
-
template<bool is16Bit, bool isUnsigned>
static inline int16 readSample(const byte *ptr) {
uint16 sample = is16Bit ? READ_BE_UINT16(ptr) : (*ptr << 8);
Index: rate.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/rate.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- rate.cpp 31 Jul 2003 01:21:38 -0000 1.10
+++ rate.cpp 31 Jul 2003 18:35:01 -0000 1.11
@@ -176,12 +176,6 @@
return (ST_SUCCESS);
}
-
-#ifndef _MSC_VER
-#pragma mark -
-#endif
-
-
LinearRateConverter::LinearRateConverter(st_rate_t inrate, st_rate_t outrate) {
st_rate_start(&effp, inrate, outrate);
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/common scummsys.h,1.33,1.34 stdafx.h,1.10,1.11
- Next message: [Scummvm-cvs-logs] CVS: scummvm bs2.dsp,NONE,1.1 scumm.dsp,1.44,1.45 scummvm.dsp,1.50,1.51 scummvm.dsw,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list