diff options
author | rubidium <rubidium@openttd.org> | 2007-01-10 18:56:51 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-01-10 18:56:51 +0000 |
commit | f35ed4bbc2b05f1b83476b60948d64375f77f1b4 (patch) | |
tree | 1a1c59c13ddb1d152052f3a3a0bcffe4fb531173 /src/music | |
parent | a332d10fd938f345fff18e5f4a662a58f692f734 (diff) | |
download | openttd-f35ed4bbc2b05f1b83476b60948d64375f77f1b4.tar.xz |
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
Diffstat (limited to 'src/music')
-rw-r--r-- | src/music/dmusic.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp index e20842d2e..1c5b1d200 100644 --- a/src/music/dmusic.cpp +++ b/src/music/dmusic.cpp @@ -4,12 +4,10 @@ #ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT -extern "C" { - #include "../openttd.h" - #include "../debug.h" - #include "../win32.h" - #include "dmusic.h" -} +#include "../openttd.h" +#include "../debug.h" +#include "../win32.h" +#include "dmusic.h" #include <windows.h> #include <dmksctrl.h> |