diff options
author | tron <tron@openttd.org> | 2005-07-23 15:48:00 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2005-07-23 15:48:00 +0000 |
commit | 9bb81b8eefe56db44829d32d282684df7f12c31d (patch) | |
tree | 265b5c47cc68bef828546de2508f0641f8563050 /music | |
parent | c07e074a337e985b6e5426b46c8502f6ad9c3efe (diff) | |
download | openttd-9bb81b8eefe56db44829d32d282684df7f12c31d.tar.xz |
(svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
Diffstat (limited to 'music')
-rw-r--r-- | music/null_m.c (renamed from music/null.c) | 2 | ||||
-rw-r--r-- | music/null_m.h (renamed from music/null.h) | 0 | ||||
-rw-r--r-- | music/win32_m.c (renamed from music/win32.c) | 2 | ||||
-rw-r--r-- | music/win32_m.h (renamed from music/win32.h) | 0 |
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 |