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

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