(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

10 files changed, 20 insertions, 0 deletions

diff --git a/src/music/allegro_m.cpp b/src/music/allegro_m.cpp
index 955182590..77b488186 100644
--- a/src/music/allegro_m.cpp
+++ b/src/music/allegro_m.cpp
@@ -16,6 +16,8 @@
 #include "allegro_m.h"
 #include <allegro.h>
 
+#include "../safeguards.h"
+
 static FMusicDriver_Allegro iFMusicDriver_Allegro;
 static MIDI *_midi = NULL;
 
diff --git a/src/music/bemidi.cpp b/src/music/bemidi.cpp
index 5ee62dfe5..2bc207476 100644
--- a/src/music/bemidi.cpp
+++ b/src/music/bemidi.cpp
@@ -16,6 +16,8 @@
 /* BeOS System Includes */
 #include <MidiSynthFile.h>
 
+#include "../safeguards.h"
+
 /** The file we're playing. */
 static BMidiSynthFile midiSynthFile;
 
diff --git a/src/music/cocoa_m.cpp b/src/music/cocoa_m.cpp
index e7c7d6b75..a201984ae 100644
--- a/src/music/cocoa_m.cpp
+++ b/src/music/cocoa_m.cpp
@@ -28,6 +28,8 @@
 #undef Rect
 #undef Point
 
+#include "../safeguards.h"
+
 static FMusicDriver_Cocoa iFMusicDriver_Cocoa;
 
 
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp
index 185d66a76..40ce69d1a 100644
--- a/src/music/dmusic.cpp
+++ b/src/music/dmusic.cpp
@@ -27,6 +27,8 @@
 #include <dmusicc.h>
 #include <dmusicf.h>
 
+#include "../safeguards.h"
+
 static FMusicDriver_DMusic iFMusicDriver_DMusic;
 
 /** the direct music object manages buffers and ports */
diff --git a/src/music/extmidi.cpp b/src/music/extmidi.cpp
index 93492aa99..6bfc990e5 100644
--- a/src/music/extmidi.cpp
+++ b/src/music/extmidi.cpp
@@ -25,6 +25,8 @@
 #include <sys/stat.h>
 #include <errno.h>
 
+#include "../safeguards.h"
+
 #ifndef EXTERNAL_PLAYER
 /** The default external midi player. */
 #define EXTERNAL_PLAYER "timidity"
diff --git a/src/music/libtimidity.cpp b/src/music/libtimidity.cpp
index 92f17212c..1cb2adc0f 100644
--- a/src/music/libtimidity.cpp
+++ b/src/music/libtimidity.cpp
@@ -26,6 +26,8 @@
 #include <pspaudiolib.h>
 #endif /* PSP */
 
+#include "../safeguards.h"
+
 /** The state of playing. */
 enum MidiState {
 	MIDI_STOPPED = 0,
diff --git a/src/music/null_m.cpp b/src/music/null_m.cpp
index cb42a906a..90d08d04a 100644
--- a/src/music/null_m.cpp
+++ b/src/music/null_m.cpp
@@ -12,5 +12,7 @@
 #include "../stdafx.h"
 #include "null_m.h"
 
+#include "../safeguards.h"
+
 /** The factory for the music player that does nothing. */
 static FMusicDriver_Null iFMusicDriver_Null;
diff --git a/src/music/os2_m.cpp b/src/music/os2_m.cpp
index ec1fca264..d7fb97d2d 100644
--- a/src/music/os2_m.cpp
+++ b/src/music/os2_m.cpp
@@ -21,6 +21,8 @@
 #include <os2.h>
 #include <os2me.h>
 
+#include "../safeguards.h"
+
 /**********************
  * OS/2 MIDI PLAYER
  **********************/
diff --git a/src/music/qtmidi.cpp b/src/music/qtmidi.cpp
index 0cfe318e7..dfd6f16eb 100644
--- a/src/music/qtmidi.cpp
+++ b/src/music/qtmidi.cpp
@@ -38,6 +38,8 @@
 #undef Rect
 #undef Point
 
+#include "../safeguards.h"
+
 static FMusicDriver_QtMidi iFMusicDriver_QtMidi;
 
 
diff --git a/src/music/win32_m.cpp b/src/music/win32_m.cpp
index 65ffbbc6b..d3a7019a0 100644
--- a/src/music/win32_m.cpp
+++ b/src/music/win32_m.cpp
@@ -15,6 +15,8 @@
 #include <windows.h>
 #include <mmsystem.h>
 
+#include "../safeguards.h"
+
 static struct {
 	bool stop_song;
 	bool terminate;