From 47e426f271fdd08c3fe8e1c8b383cecd27cdd951 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 6 May 2009 13:57:05 +0000
Subject: Don't include headers inside namespace scopes. This should fix
 compilation on NDS at least.

svn-id: r40360
---
 sound/softsynth/opl/dosbox.cpp | 1 +
 sound/softsynth/opl/mame.cpp   | 5 ++++-
 sound/softsynth/opl/opl.h      | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'sound')

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
 
 /*
-- 
cgit v1.2.3