summaryrefslogtreecommitdiff
path: root/src/sound
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2014-04-23 20:13:33 +0000
committerrubidium <rubidium@openttd.org>2014-04-23 20:13:33 +0000
commit0463dbdc9e5b39399765015c394e29dedaf7d041 (patch)
tree0d115f2027997f6c452d59d63919f9a6d05cb8be /src/sound
parent287ecd158249628a9b12aa5567e0e188499084f5 (diff)
downloadopenttd-0463dbdc9e5b39399765015c394e29dedaf7d041.tar.xz
(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
Diffstat (limited to 'src/sound')
-rw-r--r--src/sound/allegro_s.cpp2
-rw-r--r--src/sound/cocoa_s.cpp2
-rw-r--r--src/sound/null_s.cpp2
-rw-r--r--src/sound/sdl_s.cpp2
-rw-r--r--src/sound/win32_s.cpp2
5 files changed, 10 insertions, 0 deletions
diff --git a/src/sound/allegro_s.cpp b/src/sound/allegro_s.cpp
index 76a1e1e91..88a723ff8 100644
--- a/src/sound/allegro_s.cpp
+++ b/src/sound/allegro_s.cpp
@@ -18,6 +18,8 @@
#include "allegro_s.h"
#include <allegro.h>
+#include "../safeguards.h"
+
static FSoundDriver_Allegro iFSoundDriver_Allegro;
/** The stream we are writing too */
static AUDIOSTREAM *_stream = NULL;
diff --git a/src/sound/cocoa_s.cpp b/src/sound/cocoa_s.cpp
index 1dc2a25d4..8cf4a632b 100644
--- a/src/sound/cocoa_s.cpp
+++ b/src/sound/cocoa_s.cpp
@@ -30,6 +30,8 @@
#undef Rect
#undef Point
+#include "../safeguards.h"
+
static FSoundDriver_Cocoa iFSoundDriver_Cocoa;
static AudioUnit _outputAudioUnit;
diff --git a/src/sound/null_s.cpp b/src/sound/null_s.cpp
index 953bf5764..3dc95c46f 100644
--- a/src/sound/null_s.cpp
+++ b/src/sound/null_s.cpp
@@ -12,5 +12,7 @@
#include "../stdafx.h"
#include "null_s.h"
+#include "../safeguards.h"
+
/** The factory for the null sound driver. */
static FSoundDriver_Null iFSoundDriver_Null;
diff --git a/src/sound/sdl_s.cpp b/src/sound/sdl_s.cpp
index 7e1c3e993..e3fb99eaa 100644
--- a/src/sound/sdl_s.cpp
+++ b/src/sound/sdl_s.cpp
@@ -18,6 +18,8 @@
#include "sdl_s.h"
#include <SDL.h>
+#include "../safeguards.h"
+
/** Factory for the SDL sound driver. */
static FSoundDriver_SDL iFSoundDriver_SDL;
diff --git a/src/sound/win32_s.cpp b/src/sound/win32_s.cpp
index d241f45c8..0cd632714 100644
--- a/src/sound/win32_s.cpp
+++ b/src/sound/win32_s.cpp
@@ -20,6 +20,8 @@
#include <windows.h>
#include <mmsystem.h>
+#include "../safeguards.h"
+
static FSoundDriver_Win32 iFSoundDriver_Win32;
static HWAVEOUT _waveout;