diff options
author | Darkvater <Darkvater@openttd.org> | 2007-02-12 21:55:10 +0000 |
---|---|---|
committer | Darkvater <Darkvater@openttd.org> | 2007-02-12 21:55:10 +0000 |
commit | 5574d045473965a31a86a962e749c20dcc497aa9 (patch) | |
tree | 0f33d24a48c6bc70726b21200657287d3e9ba408 /src/music | |
parent | 8f96cadeb2da3d7613166af7f95817647e24adee (diff) | |
download | openttd-5574d045473965a31a86a962e749c20dcc497aa9.tar.xz |
(svn r8691) -Cleanup: Some proper #endif comments for sound/music/video files, and a little elimination of magic numbers in Win32SoundStart
Diffstat (limited to 'src/music')
-rw-r--r-- | src/music/dmusic.cpp | 5 | ||||
-rw-r--r-- | src/music/dmusic.h | 2 | ||||
-rw-r--r-- | src/music/null_m.h | 2 | ||||
-rw-r--r-- | src/music/win32_m.h | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp index 1c5b1d200..9c2c6a2cd 100644 --- a/src/music/dmusic.cpp +++ b/src/music/dmusic.cpp @@ -4,7 +4,6 @@ #ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT -#include "../openttd.h" #include "../debug.h" #include "../win32.h" #include "dmusic.h" @@ -218,7 +217,7 @@ static void DMusicMidiSetVolume(byte vol) } -extern "C" const HalMusicDriver _dmusic_midi_driver = { +const HalMusicDriver _dmusic_midi_driver = { DMusicMidiStart, DMusicMidiStop, DMusicMidiPlaySong, @@ -227,4 +226,4 @@ extern "C" const HalMusicDriver _dmusic_midi_driver = { DMusicMidiSetVolume, }; -#endif +#endif /* WIN32_ENABLE_DIRECTMUSIC_SUPPORT */ diff --git a/src/music/dmusic.h b/src/music/dmusic.h index 5d0990137..a01269e1d 100644 --- a/src/music/dmusic.h +++ b/src/music/dmusic.h @@ -7,4 +7,4 @@ extern const HalMusicDriver _dmusic_midi_driver; -#endif +#endif /* MUSIC_DMUSIC_H */ diff --git a/src/music/null_m.h b/src/music/null_m.h index 0f3e2cfa5..d6edfb71d 100644 --- a/src/music/null_m.h +++ b/src/music/null_m.h @@ -7,4 +7,4 @@ extern const HalMusicDriver _null_music_driver; -#endif +#endif /* MUSIC_NULL_H */ diff --git a/src/music/win32_m.h b/src/music/win32_m.h index 83893ed1e..162be9d97 100644 --- a/src/music/win32_m.h +++ b/src/music/win32_m.h @@ -7,4 +7,4 @@ extern const HalMusicDriver _win32_music_driver; -#endif +#endif /* MUSIC_WIN32_H */ |