[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.130,1.131 dimuse_music.cpp,1.41,1.42 dimuse_tables.cpp,1.21,1.22 dimuse_track.cpp,1.52,1.53

Chris Apers chrilith at users.sourceforge.net
Sat Oct 8 13:45:57 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15629/imuse_digi

Modified Files:
	dimuse.cpp dimuse_music.cpp dimuse_tables.cpp dimuse_track.cpp 
Log Message:
revert previous changes related to #ifdefs

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- dimuse.cpp	8 Oct 2005 20:14:40 -0000	1.130
+++ dimuse.cpp	8 Oct 2005 20:44:19 -0000	1.131
@@ -18,8 +18,6 @@
  * $Header$
  */
 
-#ifndef DISABLE_SCUMM_7_8
-
 #include "common/stdafx.h"
 #include "common/system.h"
 #include "common/timer.h"
@@ -411,5 +409,3 @@
 }
 
 } // End of namespace Scumm
-
-#endif

Index: dimuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_music.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- dimuse_music.cpp	8 Oct 2005 20:14:40 -0000	1.41
+++ dimuse_music.cpp	8 Oct 2005 20:44:19 -0000	1.42
@@ -18,8 +18,6 @@
  * $Header$
  */
 
-#ifndef DISABLE_SCUMM_7_8
-
 #include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "scumm/scumm.h"
@@ -443,5 +441,3 @@
 
 
 } // End of namespace Scumm
-
-#endif

Index: dimuse_tables.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_tables.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- dimuse_tables.cpp	8 Oct 2005 20:14:40 -0000	1.21
+++ dimuse_tables.cpp	8 Oct 2005 20:44:19 -0000	1.22
@@ -18,8 +18,6 @@
  * $Header$
  */
 
-#ifndef DISABLE_SCUMM_7_8
-
 #include "common/stdafx.h"
 #include "scumm/imuse_digi/dimuse.h"
 
@@ -880,5 +878,3 @@
 _GEND
 
 #endif
-
-#endif

Index: dimuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_track.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- dimuse_track.cpp	8 Oct 2005 20:14:40 -0000	1.52
+++ dimuse_track.cpp	8 Oct 2005 20:44:19 -0000	1.53
@@ -18,8 +18,6 @@
  * $Header$
  */
 
-#ifndef DISABLE_SCUMM_7_8
-
 #include "common/stdafx.h"
 #include "common/timer.h"
 
@@ -362,5 +360,3 @@
 }
 
 } // End of namespace Scumm
-
-#endif





More information about the Scummvm-git-logs mailing list