[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.9,1.10 simon.cpp,1.26,1.27 simonsys.cpp,1.7,1.8

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv6388/simon

Modified Files:
	midi.cpp simon.cpp simonsys.cpp 
Log Message:
cleaning up the mess drigo left... <sigh>

Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- midi.cpp	5 May 2002 19:01:36 -0000	1.9
+++ midi.cpp	5 May 2002 20:04:26 -0000	1.10
@@ -23,13 +23,8 @@
 #include "stdafx.h"
 #include "scummsys.h"
 #include "system.h"
-#ifndef macintosh
 #include "../sound/mididrv.h"
 #include "../sound/mixer.h"
-#else
-#include "mididrv.h"
-#include "mixer.h"
-#endif
 #include "simon.h"
 
 void MidiPlayer::read_from_file(void *dst, uint size) {

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- simon.cpp	5 May 2002 19:01:36 -0000	1.26
+++ simon.cpp	5 May 2002 20:04:26 -0000	1.27
@@ -23,11 +23,7 @@
 #include "stdafx.h"
 #include "scummsys.h"
 #include "system.h"
-#ifndef macintosh
 #include "../sound/mixer.h"
-#else
-#include "mixer.h"
-#endif
 #include "simon.h"
 
 
@@ -38,11 +34,7 @@
 #ifdef WIN32
 #include <malloc.h>
 #endif
-#ifndef macintosh
 #include <sys/stat.h>
-#else
-#include <stat.h>
-#endif
 
 int sdl_mouse_x, sdl_mouse_y;
 

Index: simonsys.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simonsys.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- simonsys.cpp	5 May 2002 19:01:37 -0000	1.7
+++ simonsys.cpp	5 May 2002 20:04:26 -0000	1.8
@@ -23,11 +23,7 @@
 #include "stdafx.h"
 #include "scummsys.h"
 #include "system.h"
-#ifndef macintosh
 #include "../sound/mixer.h"
-#else
-#include "mixer.h"
-#endif
 #include "simon.h"
 
 #include <stdarg.h>