[Scummvm-cvs-logs] SF.net SVN: scummvm:[40360] scummvm/trunk/sound/softsynth/opl

[lordhoto at users.sourceforge.net]

Revision: 40360
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40360&view=rev
Author:   lordhoto
Date:     2009-05-06 13:57:05 +0000 (Wed, 06 May 2009)

Log Message:
-----------
Don't include headers inside namespace scopes. This should fix compilation on NDS at least.

Modified Paths:
--------------
    scummvm/trunk/sound/softsynth/opl/dosbox.cpp
    scummvm/trunk/sound/softsynth/opl/mame.cpp
    scummvm/trunk/sound/softsynth/opl/opl.h

Modified: scummvm/trunk/sound/softsynth/opl/dosbox.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/opl/dosbox.cpp	2009-05-06 11:16:38 UTC (rev 40359)
+++ scummvm/trunk/sound/softsynth/opl/dosbox.cpp	2009-05-06 13:57:05 UTC (rev 40360)
@@ -34,6 +34,7 @@
 #include "dosbox.h"
 
 #include "common/system.h"
+#include "common/scummsys.h"
 
 #include <math.h>
 #include <string.h>

Modified: scummvm/trunk/sound/softsynth/opl/mame.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/opl/mame.cpp	2009-05-06 11:16:38 UTC (rev 40359)
+++ scummvm/trunk/sound/softsynth/opl/mame.cpp	2009-05-06 13:57:05 UTC (rev 40360)
@@ -37,6 +37,10 @@
 #include "common/config-manager.h"
 #endif
 
+#if defined(__DS__)
+#include "dsmain.h"
+#endif
+
 namespace OPL {
 namespace MAME {
 
@@ -94,7 +98,6 @@
 /* sinwave entries */
 /* used static memory = SIN_ENT * 4 (byte) */
 #ifdef __DS__
-#include "dsmain.h"
 #define SIN_ENT_SHIFT 8
 #else
 #define SIN_ENT_SHIFT 11

Modified: scummvm/trunk/sound/softsynth/opl/opl.h
===================================================================
--- scummvm/trunk/sound/softsynth/opl/opl.h	2009-05-06 11:16:38 UTC (rev 40359)
+++ scummvm/trunk/sound/softsynth/opl/opl.h	2009-05-06 13:57:05 UTC (rev 40360)
@@ -24,8 +24,6 @@
  * Ken Silverman's official web site: "http://www.advsys.net/ken"
  */
 
-#include "common/scummsys.h"
-
 #define fltype double
 
 /*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.