8 files changed, 32 insertions, 32 deletions
diff --git a/src/music/bemidi.cpp b/src/music/bemidi.cpp
index d87fae63b..be8535d89 100644
--- a/src/music/bemidi.cpp
+++ b/src/music/bemidi.cpp
@@ -14,7 +14,7 @@ static const char *bemidi_start(const char * const *parm)
 	return NULL;
 }
 
-static void bemidi_stop(void)
+static void bemidi_stop()
 {
 	midiSynthFile.UnloadFile();
 }
@@ -28,12 +28,12 @@ static void bemidi_play_song(const char *filename)
 	midiSynthFile.Start();
 }
 
-static void bemidi_stop_song(void)
+static void bemidi_stop_song()
 {
 	midiSynthFile.UnloadFile();
 }
 
-static bool bemidi_is_playing(void)
+static bool bemidi_is_playing()
 {
 	return !midiSynthFile.IsFinished();
 }
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp
index c52e6f99b..3846878cd 100644
--- a/src/music/dmusic.cpp
+++ b/src/music/dmusic.cpp
@@ -107,7 +107,7 @@ static const char* DMusicMidiStart(const char* const* parm)
 }
 
 
-static void DMusicMidiStop(void)
+static void DMusicMidiStop()
 {
 	seeking = false;
 
@@ -186,7 +186,7 @@ static void DMusicMidiPlaySong(const char* filename)
 }
 
 
-static void DMusicMidiStopSong(void)
+static void DMusicMidiStopSong()
 {
 	if (FAILED(performance->Stop(segment, NULL, 0, 0))) {
 		DEBUG(driver, 0, "DirectMusic: StopSegment failed");
@@ -195,7 +195,7 @@ static void DMusicMidiStopSong(void)
 }
 
 
-static bool DMusicMidiIsSongPlaying(void)
+static bool DMusicMidiIsSongPlaying()
 {
 	/* Not the nicest code, but there is a short delay before playing actually
 	 * starts. OpenTTD makes no provision for this. */
diff --git a/src/music/extmidi.cpp b/src/music/extmidi.cpp
index 901fa4fd7..4c2f2f1e2 100644
--- a/src/music/extmidi.cpp
+++ b/src/music/extmidi.cpp
@@ -21,8 +21,8 @@ static struct {
 	pid_t pid;
 } _midi;
 
-static void DoPlay(void);
-static void DoStop(void);
+static void DoPlay();
+static void DoStop();
 
 static const char* ExtMidiStart(const char* const * parm)
 {
@@ -31,7 +31,7 @@ static const char* ExtMidiStart(const char* const * parm)
 	return NULL;
 }
 
-static void ExtMidiStop(void)
+static void ExtMidiStop()
 {
 	_midi.song[0] = '\0';
 	DoStop();
@@ -43,13 +43,13 @@ static void ExtMidiPlaySong(const char* filename)
 	DoStop();
 }
 
-static void ExtMidiStopSong(void)
+static void ExtMidiStopSong()
 {
 	_midi.song[0] = '\0';
 	DoStop();
 }
 
-static bool ExtMidiIsPlaying(void)
+static bool ExtMidiIsPlaying()
 {
 	if (_midi.pid != -1 && waitpid(_midi.pid, NULL, WNOHANG) == _midi.pid)
 		_midi.pid = -1;
@@ -62,7 +62,7 @@ static void ExtMidiSetVolume(byte vol)
 	DEBUG(driver, 1, "extmidi: set volume not implemented");
 }
 
-static void DoPlay(void)
+static void DoPlay()
 {
 	_midi.pid = fork();
 	switch (_midi.pid) {
@@ -91,7 +91,7 @@ static void DoPlay(void)
 	}
 }
 
-static void DoStop(void)
+static void DoStop()
 {
 	if (_midi.pid != -1) kill(_midi.pid, SIGTERM);
 }
diff --git a/src/music/libtimidity.cpp b/src/music/libtimidity.cpp
index 32168a5a7..f25b0bfff 100644
--- a/src/music/libtimidity.cpp
+++ b/src/music/libtimidity.cpp
@@ -77,7 +77,7 @@ static const char *LibtimidityMidiStart(const char *const *param)
 	return NULL;
 }
 
-static void LibtimidityMidiStop(void)
+static void LibtimidityMidiStop()
 {
 	if (_midi.status == MIDI_PLAYING) {
 		_midi.status = MIDI_STOPPED;
@@ -107,13 +107,13 @@ static void LibtimidityMidiPlaySong(const char *filename)
 	_midi.status = MIDI_PLAYING;
 }
 
-static void LibtimidityMidiStopSong(void)
+static void LibtimidityMidiStopSong()
 {
 	_midi.status = MIDI_STOPPED;
 	mid_song_free(_midi.song);
 }
 
-static bool LibtimidityMidiIsPlaying(void)
+static bool LibtimidityMidiIsPlaying()
 {
 	if (_midi.status == MIDI_PLAYING) {
 		_midi.song_position = mid_song_get_time(_midi.song);
diff --git a/src/music/null_m.cpp b/src/music/null_m.cpp
index b2b83877c..01f7a401e 100644
--- a/src/music/null_m.cpp
+++ b/src/music/null_m.cpp
@@ -4,10 +4,10 @@
 #include "null_m.h"
 
 static const char* NullMidiStart(const char* const* parm) { return NULL; }
-static void NullMidiStop(void) {}
+static void NullMidiStop() {}
 static void NullMidiPlaySong(const char *filename) {}
-static void NullMidiStopSong(void) {}
-static bool NullMidiIsSongPlaying(void) { return true; }
+static void NullMidiStopSong() {}
+static bool NullMidiIsSongPlaying() { return true; }
 static void NullMidiSetVolume(byte vol) {}
 
 const HalMusicDriver _null_music_driver = {
diff --git a/src/music/os2_m.cpp b/src/music/os2_m.cpp
index 75df60c8d..c067e8d53 100644
--- a/src/music/os2_m.cpp
+++ b/src/music/os2_m.cpp
@@ -40,7 +40,7 @@ static void OS2MidiPlaySong(const char *filename)
 	MidiSendCommand("play song from 0");
 }
 
-static void OS2MidiStopSong(void)
+static void OS2MidiStopSong()
 {
 	MidiSendCommand("close all");
 }
@@ -50,7 +50,7 @@ static void OS2MidiSetVolume(byte vol)
 	MidiSendCommand("set song audio volume %d", ((vol/127)*100));
 }
 
-static bool OS2MidiIsSongPlaying(void)
+static bool OS2MidiIsSongPlaying()
 {
 	char buf[16];
 	mciSendString("status song mode", buf, sizeof(buf), NULL, 0);
@@ -62,7 +62,7 @@ static const char *OS2MidiStart(const char * const *parm)
 	return 0;
 }
 
-static void OS2MidiStop(void)
+static void OS2MidiStop()
 {
 	MidiSendCommand("close all");
 }
diff --git a/src/music/qtmidi.cpp b/src/music/qtmidi.cpp
index 33c719365..c36dbcddc 100644
--- a/src/music/qtmidi.cpp
+++ b/src/music/qtmidi.cpp
@@ -173,7 +173,7 @@ static bool _quicktime_started = false;
  * #_quicktime_started flag to @c true if QuickTime is present in the system
  * and it was initialized properly.
  */
-static void InitQuickTimeIfNeeded(void)
+static void InitQuickTimeIfNeeded()
 {
 	OSStatus dummy;
 
@@ -207,7 +207,7 @@ static int   _quicktime_state  = QT_STATE_IDLE; /**< Current player state. */
 #define VOLUME  ((short)((0x00FF & _quicktime_volume) << 1))
 
 
-static void StopSong(void);
+static void StopSong();
 
 
 /**
@@ -230,7 +230,7 @@ static const char* StartDriver(const char * const *parm)
  * This function is called at regular intervals from OpenTTD's main loop, so
  * we call @c MoviesTask() from here to let QuickTime do its work.
  */
-static bool SongIsPlaying(void)
+static bool SongIsPlaying()
 {
 	if (!_quicktime_started) return true;
 
@@ -258,7 +258,7 @@ static bool SongIsPlaying(void)
  * Stops playing and frees any used resources before returning. As it
  * deinitilizes QuickTime, the #_quicktime_started flag is set to @c false.
  */
-static void StopDriver(void)
+static void StopDriver()
 {
 	if (!_quicktime_started) return;
 
@@ -312,7 +312,7 @@ static void PlaySong(const char *filename)
 /**
  * Stops playing the current song, if the player is active.
  */
-static void StopSong(void)
+static void StopSong()
 {
 	if (!_quicktime_started) return;
 
diff --git a/src/music/win32_m.cpp b/src/music/win32_m.cpp
index 1096584d9..7ec9a945e 100644
--- a/src/music/win32_m.cpp
+++ b/src/music/win32_m.cpp
@@ -23,7 +23,7 @@ static void Win32MidiPlaySong(const char *filename)
 	SetEvent(_midi.wait_obj);
 }
 
-static void Win32MidiStopSong(void)
+static void Win32MidiStopSong()
 {
 	if (_midi.playing) {
 		_midi.stop_song = true;
@@ -32,7 +32,7 @@ static void Win32MidiStopSong(void)
 	}
 }
 
-static bool Win32MidiIsSongPlaying(void)
+static bool Win32MidiIsSongPlaying()
 {
 	return _midi.playing;
 }
@@ -62,7 +62,7 @@ static bool MidiIntPlaySong(const char *filename)
 	return MidiSendCommand("play song from 0") == 0;
 }
 
-static void MidiIntStopSong(void)
+static void MidiIntStopSong()
 {
 	MidiSendCommand("close all");
 }
@@ -73,7 +73,7 @@ static void MidiIntSetVolume(int vol)
 	midiOutSetVolume((HMIDIOUT)_midi.devid, v + (v << 16));
 }
 
-static bool MidiIntIsSongPlaying(void)
+static bool MidiIntIsSongPlaying()
 {
 	char buf[16];
 	mciSendStringA("status song mode", buf, sizeof(buf), 0);
@@ -146,7 +146,7 @@ static const char *Win32MidiStart(const char * const *parm)
 	return NULL;
 }
 
-static void Win32MidiStop(void)
+static void Win32MidiStop()
 {
 	_midi.terminate = true;
 	SetEvent(_midi.wait_obj);