(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

13 files changed, 26 insertions, 0 deletions

diff --git a/src/blitter/32bpp_anim.cpp b/src/blitter/32bpp_anim.cpp
index 80ec54da4..71c3e0a34 100644
--- a/src/blitter/32bpp_anim.cpp
+++ b/src/blitter/32bpp_anim.cpp
@@ -15,6 +15,8 @@
 
 #include "../table/sprites.h"
 
+#include "../safeguards.h"
+
 /** Instantiation of the 32bpp with animation blitter factory. */
 static FBlitter_32bppAnim iFBlitter_32bppAnim;
 
diff --git a/src/blitter/32bpp_anim_sse4.cpp b/src/blitter/32bpp_anim_sse4.cpp
index d456da22d..f25683a10 100644
--- a/src/blitter/32bpp_anim_sse4.cpp
+++ b/src/blitter/32bpp_anim_sse4.cpp
@@ -17,6 +17,8 @@
 #include "32bpp_anim_sse4.hpp"
 #include "32bpp_sse_func.hpp"
 
+#include "../safeguards.h"
+
 /** Instantiation of the SSE4 32bpp blitter factory. */
 static FBlitter_32bppSSE4_Anim iFBlitter_32bppSSE4_Anim;
 
diff --git a/src/blitter/32bpp_base.cpp b/src/blitter/32bpp_base.cpp
index 3ea03327f..26dd2f037 100644
--- a/src/blitter/32bpp_base.cpp
+++ b/src/blitter/32bpp_base.cpp
@@ -12,6 +12,8 @@
 #include "../stdafx.h"
 #include "32bpp_base.hpp"
 
+#include "../safeguards.h"
+
 void *Blitter_32bppBase::MoveTo(void *video, int x, int y)
 {
 	return (uint32 *)video + x + y * _screen.pitch;
diff --git a/src/blitter/32bpp_optimized.cpp b/src/blitter/32bpp_optimized.cpp
index 5d2332883..9b7d7115c 100644
--- a/src/blitter/32bpp_optimized.cpp
+++ b/src/blitter/32bpp_optimized.cpp
@@ -14,6 +14,8 @@
 #include "../settings_type.h"
 #include "32bpp_optimized.hpp"
 
+#include "../safeguards.h"
+
 /** Instantiation of the optimized 32bpp blitter factory. */
 static FBlitter_32bppOptimized iFBlitter_32bppOptimized;
 
diff --git a/src/blitter/32bpp_simple.cpp b/src/blitter/32bpp_simple.cpp
index 30443c50b..0ad7418db 100644
--- a/src/blitter/32bpp_simple.cpp
+++ b/src/blitter/32bpp_simple.cpp
@@ -15,6 +15,8 @@
 
 #include "../table/sprites.h"
 
+#include "../safeguards.h"
+
 /** Instantiation of the simple 32bpp blitter factory. */
 static FBlitter_32bppSimple iFBlitter_32bppSimple;
 
diff --git a/src/blitter/32bpp_sse2.cpp b/src/blitter/32bpp_sse2.cpp
index 5b7316cce..ae2b3ccc5 100644
--- a/src/blitter/32bpp_sse2.cpp
+++ b/src/blitter/32bpp_sse2.cpp
@@ -17,6 +17,8 @@
 #include "32bpp_sse2.hpp"
 #include "32bpp_sse_func.hpp"
 
+#include "../safeguards.h"
+
 /** Instantiation of the SSE2 32bpp blitter factory. */
 static FBlitter_32bppSSE2 iFBlitter_32bppSSE2;
 
diff --git a/src/blitter/32bpp_sse4.cpp b/src/blitter/32bpp_sse4.cpp
index dab0d8f3e..723264f03 100644
--- a/src/blitter/32bpp_sse4.cpp
+++ b/src/blitter/32bpp_sse4.cpp
@@ -17,6 +17,8 @@
 #include "32bpp_sse4.hpp"
 #include "32bpp_sse_func.hpp"
 
+#include "../safeguards.h"
+
 /** Instantiation of the SSE4 32bpp blitter factory. */
 static FBlitter_32bppSSE4 iFBlitter_32bppSSE4;
 
diff --git a/src/blitter/32bpp_ssse3.cpp b/src/blitter/32bpp_ssse3.cpp
index 33d49648e..ab6c9eba5 100644
--- a/src/blitter/32bpp_ssse3.cpp
+++ b/src/blitter/32bpp_ssse3.cpp
@@ -17,6 +17,8 @@
 #include "32bpp_ssse3.hpp"
 #include "32bpp_sse_func.hpp"
 
+#include "../safeguards.h"
+
 /** Instantiation of the SSSE3 32bpp blitter factory. */
 static FBlitter_32bppSSSE3 iFBlitter_32bppSSSE3;
 
diff --git a/src/blitter/8bpp_base.cpp b/src/blitter/8bpp_base.cpp
index f2ba70405..eab6eaa0d 100644
--- a/src/blitter/8bpp_base.cpp
+++ b/src/blitter/8bpp_base.cpp
@@ -13,6 +13,8 @@
 #include "../gfx_func.h"
 #include "8bpp_base.hpp"
 
+#include "../safeguards.h"
+
 void Blitter_8bppBase::DrawColourMappingRect(void *dst, int width, int height, PaletteID pal)
 {
 	const uint8 *ctab = GetNonSprite(pal, ST_RECOLOUR) + 1;
diff --git a/src/blitter/8bpp_optimized.cpp b/src/blitter/8bpp_optimized.cpp
index 31661c360..bcd8dc282 100644
--- a/src/blitter/8bpp_optimized.cpp
+++ b/src/blitter/8bpp_optimized.cpp
@@ -15,6 +15,8 @@
 #include "../core/math_func.hpp"
 #include "8bpp_optimized.hpp"
 
+#include "../safeguards.h"
+
 /** Instantiation of the 8bpp optimised blitter factory. */
 static FBlitter_8bppOptimized iFBlitter_8bppOptimized;
 
diff --git a/src/blitter/8bpp_simple.cpp b/src/blitter/8bpp_simple.cpp
index d98cff1c9..d24d8caac 100644
--- a/src/blitter/8bpp_simple.cpp
+++ b/src/blitter/8bpp_simple.cpp
@@ -13,6 +13,8 @@
 #include "../zoom_func.h"
 #include "8bpp_simple.hpp"
 
+#include "../safeguards.h"
+
 /** Instantiation of the simple 8bpp blitter factory. */
 static FBlitter_8bppSimple iFBlitter_8bppSimple;
 
diff --git a/src/blitter/base.cpp b/src/blitter/base.cpp
index d30f4054b..e83df2e71 100644
--- a/src/blitter/base.cpp
+++ b/src/blitter/base.cpp
@@ -13,6 +13,8 @@
 #include "base.hpp"
 #include "../core/math_func.hpp"
 
+#include "../safeguards.h"
+
 void Blitter::DrawLine(void *video, int x, int y, int x2, int y2, int screen_width, int screen_height, uint8 colour, int width, int dash)
 {
 	int dy;
diff --git a/src/blitter/null.cpp b/src/blitter/null.cpp
index 1c2b379d1..e968abe13 100644
--- a/src/blitter/null.cpp
+++ b/src/blitter/null.cpp
@@ -12,6 +12,8 @@
 #include "../stdafx.h"
 #include "null.hpp"
 
+#include "../safeguards.h"
+
 /** Instantiation of the null blitter factory. */
 static FBlitter_Null iFBlitter_Null;