summaryrefslogtreecommitdiff
path: root/src/os
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/os
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/os')
-rw-r--r--src/os/macosx/crashlog_osx.cpp2
-rw-r--r--src/os/macosx/splash.cpp2
-rw-r--r--src/os/os2/os2.cpp2
-rw-r--r--src/os/unix/crashlog_unix.cpp2
-rw-r--r--src/os/unix/unix.cpp2
-rw-r--r--src/os/windows/crashlog_win.cpp2
-rw-r--r--src/os/windows/win32.cpp2
7 files changed, 14 insertions, 0 deletions
diff --git a/src/os/macosx/crashlog_osx.cpp b/src/os/macosx/crashlog_osx.cpp
index 109b3e5fe..05816c67e 100644
--- a/src/os/macosx/crashlog_osx.cpp
+++ b/src/os/macosx/crashlog_osx.cpp
@@ -22,6 +22,8 @@
#include <dlfcn.h>
#include <cxxabi.h>
+#include "../../safeguards.h"
+
/* Macro testing a stack address for valid alignment. */
#if defined(__i386__)
diff --git a/src/os/macosx/splash.cpp b/src/os/macosx/splash.cpp
index bc1cd2dbf..eadb78510 100644
--- a/src/os/macosx/splash.cpp
+++ b/src/os/macosx/splash.cpp
@@ -23,6 +23,8 @@
#include <png.h>
+#include "../../safeguards.h"
+
/**
* Handle pnglib error.
*
diff --git a/src/os/os2/os2.cpp b/src/os/os2/os2.cpp
index 82ba19924..283104d08 100644
--- a/src/os/os2/os2.cpp
+++ b/src/os/os2/os2.cpp
@@ -30,6 +30,8 @@
#include <dos.h>
#endif
+#include "../../safeguards.h"
+
#define INCL_WIN
#define INCL_WINCLIPBOARD
diff --git a/src/os/unix/crashlog_unix.cpp b/src/os/unix/crashlog_unix.cpp
index 0960720d1..47de057f7 100644
--- a/src/os/unix/crashlog_unix.cpp
+++ b/src/os/unix/crashlog_unix.cpp
@@ -31,6 +31,8 @@
#include <unistd.h>
#endif
+#include "../../safeguards.h"
+
/**
* Unix implementation for the crash logger.
*/
diff --git a/src/os/unix/unix.cpp b/src/os/unix/unix.cpp
index 09bf6c6e7..accfffc06 100644
--- a/src/os/unix/unix.cpp
+++ b/src/os/unix/unix.cpp
@@ -63,6 +63,8 @@ ULONG __stack = (1024*1024)*2; // maybe not that much is needed actually ;)
#endif
#endif
+#include "../../safeguards.h"
+
bool FiosIsRoot(const char *path)
{
#if !defined(__MORPHOS__) && !defined(__AMIGAOS__)
diff --git a/src/os/windows/crashlog_win.cpp b/src/os/windows/crashlog_win.cpp
index 41f83b60b..9704403c8 100644
--- a/src/os/windows/crashlog_win.cpp
+++ b/src/os/windows/crashlog_win.cpp
@@ -24,6 +24,8 @@
#include <windows.h>
#include <signal.h>
+#include "../../safeguards.h"
+
static const uint MAX_SYMBOL_LEN = 512;
static const uint MAX_FRAMES = 64;
diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp
index d7ea4ab35..30d964df7 100644
--- a/src/os/windows/win32.cpp
+++ b/src/os/windows/win32.cpp
@@ -29,6 +29,8 @@
#include <errno.h>
#include <sys/stat.h>
+#include "../../safeguards.h"
+
static bool _has_console;
static bool _cursor_disable = true;
static bool _cursor_visible = true;