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 | 10fd03e222dfd78abd7e9c78a215d4b8bc36cf3b (patch) | |
tree | 265b5c47cc68bef828546de2508f0641f8563050 /sound | |
parent | 54e02a620a6e71e30ac49c604ff225a44a3d623b (diff) | |
download | openttd-10fd03e222dfd78abd7e9c78a215d4b8bc36cf3b.tar.xz |
(svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
Diffstat (limited to 'sound')
-rw-r--r-- | sound/null_s.c (renamed from sound/null.c) | 2 | ||||
-rw-r--r-- | sound/null_s.h (renamed from sound/null.h) | 0 | ||||
-rw-r--r-- | sound/sdl_s.c (renamed from sound/sdl.c) | 2 | ||||
-rw-r--r-- | sound/sdl_s.h (renamed from sound/sdl.h) | 0 | ||||
-rw-r--r-- | sound/win32_s.c (renamed from sound/win32.c) | 2 | ||||
-rw-r--r-- | sound/win32_s.h (renamed from sound/win32.h) | 0 |
6 files changed, 3 insertions, 3 deletions
diff --git a/sound/null.c b/sound/null_s.c index e7d0c8c10..744a209bd 100644 --- a/sound/null.c +++ b/sound/null_s.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "openttd.h" -#include "sound/null.h" +#include "sound/null_s.h" static const char *NullSoundStart(const char * const *parm) { return NULL; } static void NullSoundStop(void) {} diff --git a/sound/null.h b/sound/null_s.h index 63cc5ef8f..63cc5ef8f 100644 --- a/sound/null.h +++ b/sound/null_s.h diff --git a/sound/sdl.c b/sound/sdl_s.c index 2f227ad39..9ff1ca5cb 100644 --- a/sound/sdl.c +++ b/sound/sdl_s.c @@ -3,7 +3,7 @@ #include "driver.h" #include "mixer.h" #include "sdl.h" -#include "sound/sdl.h" +#include "sound/sdl_s.h" #include <SDL.h> static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len) diff --git a/sound/sdl.h b/sound/sdl_s.h index 9e593991a..9e593991a 100644 --- a/sound/sdl.h +++ b/sound/sdl_s.h diff --git a/sound/win32.c b/sound/win32_s.c index 9d58515a3..a67249fa5 100644 --- a/sound/win32.c +++ b/sound/win32_s.c @@ -3,7 +3,7 @@ #include "driver.h" #include "functions.h" #include "mixer.h" -#include "sound/win32.h" +#include "sound/win32_s.h" #include <windows.h> static HWAVEOUT _waveout; diff --git a/sound/win32.h b/sound/win32_s.h index 1f7b82b27..1f7b82b27 100644 --- a/sound/win32.h +++ b/sound/win32_s.h |