(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.

2007-01-10 18:56:51 +00:00
parent ce75f6549d
commit a7d0cdf95f
190 changed files with 2825 additions and 2208 deletions
--- 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>