diff options
| author | Johannes Schickel | 2009-05-06 13:57:05 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-05-06 13:57:05 +0000 |
| commit | 47e426f271fdd08c3fe8e1c8b383cecd27cdd951 (patch) | |
| tree | 280799b7db9cf56177101584e162a86827043009 /sound/softsynth/opl | |
| parent | 625f218388742e13654ea938ee052abafa5cec59 (diff) | |
| download | scummvm-rg350-47e426f271fdd08c3fe8e1c8b383cecd27cdd951.tar.gz scummvm-rg350-47e426f271fdd08c3fe8e1c8b383cecd27cdd951.tar.bz2 scummvm-rg350-47e426f271fdd08c3fe8e1c8b383cecd27cdd951.zip | |
Don't include headers inside namespace scopes. This should fix compilation on NDS at least.
svn-id: r40360
Diffstat (limited to 'sound/softsynth/opl')
| -rw-r--r-- | sound/softsynth/opl/dosbox.cpp | 1 | ||||
| -rw-r--r-- | sound/softsynth/opl/mame.cpp | 5 | ||||
| -rw-r--r-- | sound/softsynth/opl/opl.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/sound/softsynth/opl/dosbox.cpp b/sound/softsynth/opl/dosbox.cpp index aef46d7e72..ae1499ef49 100644 --- a/sound/softsynth/opl/dosbox.cpp +++ b/sound/softsynth/opl/dosbox.cpp @@ -34,6 +34,7 @@ #include "dosbox.h" #include "common/system.h" +#include "common/scummsys.h" #include <math.h> #include <string.h> diff --git a/sound/softsynth/opl/mame.cpp b/sound/softsynth/opl/mame.cpp index c44abd16f9..3527d63d70 100644 --- a/sound/softsynth/opl/mame.cpp +++ b/sound/softsynth/opl/mame.cpp @@ -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 @@ void OPL::readBuffer(int16 *buffer, int length) { /* 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 diff --git a/sound/softsynth/opl/opl.h b/sound/softsynth/opl/opl.h index 74e7dac79e..abcfc8bbbc 100644 --- a/sound/softsynth/opl/opl.h +++ b/sound/softsynth/opl/opl.h @@ -24,8 +24,6 @@ * Ken Silverman's official web site: "http://www.advsys.net/ken" */ -#include "common/scummsys.h" - #define fltype double /* |