[Scummvm-cvs-logs] CVS: scummvm/sound fmopl.h,1.5,1.6 mixer.cpp,1.56,1.57

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv9332

Modified Files:
	fmopl.h mixer.cpp 
Log Message:
cleanup for -Wundef

Index: fmopl.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/fmopl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fmopl.h	4 May 2003 21:17:42 -0000	1.5
+++ fmopl.h	3 Jul 2003 22:05:22 -0000	1.6
@@ -28,9 +28,9 @@
 #define HAS_YM3812	1
 
 /* --- select emulation chips --- */
-#define BUILD_YM3812 (HAS_YM3812)
-#define BUILD_YM3526 (HAS_YM3526)
-#define BUILD_Y8950  (HAS_Y8950)
+#define BUILD_YM3812 defined(HAS_YM3812) && HAS_YM3812
+#define BUILD_YM3526 defined(HAS_YM3526) && HAS_YM3526
+#define BUILD_Y8950  defined(HAS_Y8950) && HAS_Y8950
 
 /* select output bits size of output : 8 or 16 */
 #define OPL_SAMPLE_BITS 16

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- mixer.cpp	2 Jul 2003 10:50:04 -0000	1.56
+++ mixer.cpp	3 Jul 2003 22:05:22 -0000	1.57
@@ -253,7 +253,7 @@
 
 void SoundMixer::mix(int16 *buf, uint len) {
 	_syst->lock_mutex(_mutex);
-		
+	
 	if (_premixProc && !_paused) {
 		int i;
 		_premixProc(_premixParam, buf, len);