aboutsummaryrefslogtreecommitdiff
path: root/audio/fmopl.h
diff options
context:
space:
mode:
authorMatthew Hoops2011-06-03 01:14:16 -0400
committerMatthew Hoops2011-06-03 01:14:16 -0400
commit224c71e483e09931ba386555ff3b436b9defe63d (patch)
tree8e6178331a7bbd3ee1be318d3fc7a7c7f478468f /audio/fmopl.h
parentd4c92983920cfe3b25a22d91e12c750e591b917e (diff)
parent547fd1bdcabcba0e741eb31100ba99ff73399d24 (diff)
downloadscummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.gz
scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.bz2
scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.zip
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'audio/fmopl.h')
-rw-r--r--audio/fmopl.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/audio/fmopl.h b/audio/fmopl.h
index fbce36f077..b88325a52e 100644
--- a/audio/fmopl.h
+++ b/audio/fmopl.h
@@ -23,7 +23,10 @@
#define SOUND_FMOPL_H
#include "common/scummsys.h"
-#include "common/str.h"
+
+namespace Common {
+class String;
+}
namespace OPL {