(svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...

4 files changed, 2 insertions, 2 deletions

diff --git a/music/null.c b/music/null_m.c
index 136f1d3e2..fda44fdae 100644
--- a/music/null.c
+++ b/music/null_m.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
-#include "music/null.h"
+#include "music/null_m.h"
 
 static const char* NullMidiStart(const char* const* parm) { return NULL; }
 static void NullMidiStop(void) {}
diff --git a/music/null.h b/music/null_m.h
index 5f0be7ca4..5f0be7ca4 100644
--- a/music/null.h
+++ b/music/null_m.h
diff --git a/music/win32.c b/music/win32_m.c
index eb4d42d25..73cb859a3 100644
--- a/music/win32.c
+++ b/music/win32_m.c
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "openttd.h"
-#include "music/win32.h"
+#include "music/win32_m.h"
 #include <windows.h>
 
 static struct {
diff --git a/music/win32.h b/music/win32_m.h
index 8a2a0fb2d..8a2a0fb2d 100644
--- a/music/win32.h
+++ b/music/win32_m.h