aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2010-10-30 22:44:15 +0000
committerMax Horn2010-10-30 22:44:15 +0000
commit6801af969144ef3ea4fc8035f9aebf669f8c84ff (patch)
tree885e114257db91a239be1897f4e453b99c750682
parent1425013c4bd67add0037806060b178b17c4c6e4f (diff)
downloadscummvm-rg350-6801af969144ef3ea4fc8035f9aebf669f8c84ff.tar.gz
scummvm-rg350-6801af969144ef3ea4fc8035f9aebf669f8c84ff.tar.bz2
scummvm-rg350-6801af969144ef3ea4fc8035f9aebf669f8c84ff.zip
TOOLS: Enable use of forbidden symbols
svn-id: r53965
-rw-r--r--tools/create_hugo/create_hugo.cpp3
-rw-r--r--tools/create_kyradat/create_kyradat.cpp3
-rw-r--r--tools/create_kyradat/extract.cpp3
-rw-r--r--tools/create_kyradat/games.cpp3
-rw-r--r--tools/create_kyradat/md5.cpp3
-rw-r--r--tools/create_kyradat/pak.cpp3
-rw-r--r--tools/create_kyradat/search.cpp3
-rw-r--r--tools/create_kyradat/tables.cpp3
-rw-r--r--tools/create_kyradat/util.cpp3
-rw-r--r--tools/create_lure/create_lure_dat.cpp3
-rw-r--r--tools/create_lure/process_actions.cpp3
-rw-r--r--tools/create_teenagent/create_teenagent.cpp3
-rw-r--r--tools/create_teenagent/md5.cpp3
-rw-r--r--tools/create_toon/create_toon.cpp3
14 files changed, 42 insertions, 0 deletions
diff --git a/tools/create_hugo/create_hugo.cpp b/tools/create_hugo/create_hugo.cpp
index fc3ac8a168..031804f8e1 100644
--- a/tools/create_hugo/create_hugo.cpp
+++ b/tools/create_hugo/create_hugo.cpp
@@ -25,6 +25,9 @@
* data file, used by the game engine
*/
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
// HACK to allow building with the SDL backend on MinGW
// see bug #1800764 "TOOLS: MinGW tools building broken"
#ifdef main
diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index 93a5804179..7a4b8d73a1 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -23,6 +23,9 @@
*
*/
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
// HACK to allow building with the SDL backend on MinGW
// see bug #1800764 "TOOLS: MinGW tools building broken"
#ifdef main
diff --git a/tools/create_kyradat/extract.cpp b/tools/create_kyradat/extract.cpp
index 3503aea47f..87254b03cf 100644
--- a/tools/create_kyradat/extract.cpp
+++ b/tools/create_kyradat/extract.cpp
@@ -23,6 +23,9 @@
*
*/
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
#include "extract.h"
#include <algorithm>
diff --git a/tools/create_kyradat/games.cpp b/tools/create_kyradat/games.cpp
index 008120868f..75a956cab0 100644
--- a/tools/create_kyradat/games.cpp
+++ b/tools/create_kyradat/games.cpp
@@ -23,6 +23,9 @@
*
*/
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
#include "create_kyradat.h"
// Game tables
diff --git a/tools/create_kyradat/md5.cpp b/tools/create_kyradat/md5.cpp
index 58e6e73add..214b5ef7ed 100644
--- a/tools/create_kyradat/md5.cpp
+++ b/tools/create_kyradat/md5.cpp
@@ -23,6 +23,9 @@
*
*/
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
#include "md5.h"
#define GET_UINT32(n, b, i) (n) = READ_LE_UINT32(b + i)
diff --git a/tools/create_kyradat/pak.cpp b/tools/create_kyradat/pak.cpp
index f0564ebfbf..4179f42df0 100644
--- a/tools/create_kyradat/pak.cpp
+++ b/tools/create_kyradat/pak.cpp
@@ -23,6 +23,9 @@
*
*/
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
#include "pak.h"
bool PAKFile::loadFile(const char *file, const bool isAmiga) {
diff --git a/tools/create_kyradat/search.cpp b/tools/create_kyradat/search.cpp
index 7ca41e2d92..28631fa652 100644
--- a/tools/create_kyradat/search.cpp
+++ b/tools/create_kyradat/search.cpp
@@ -23,6 +23,9 @@
*
*/
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
#include "search.h"
#include "md5.h"
diff --git a/tools/create_kyradat/tables.cpp b/tools/create_kyradat/tables.cpp
index 9cf145d9d3..777f237650 100644
--- a/tools/create_kyradat/tables.cpp
+++ b/tools/create_kyradat/tables.cpp
@@ -23,6 +23,9 @@
*
*/
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
#include "tables.h"
#include "create_kyradat.h"
diff --git a/tools/create_kyradat/util.cpp b/tools/create_kyradat/util.cpp
index a9ac5517bf..702a36bc0e 100644
--- a/tools/create_kyradat/util.cpp
+++ b/tools/create_kyradat/util.cpp
@@ -23,6 +23,9 @@
*
*/
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
#include "util.h"
#include <stdarg.h>
diff --git a/tools/create_lure/create_lure_dat.cpp b/tools/create_lure/create_lure_dat.cpp
index faa32541bc..ad883b808f 100644
--- a/tools/create_lure/create_lure_dat.cpp
+++ b/tools/create_lure/create_lure_dat.cpp
@@ -27,6 +27,9 @@
* to work properly
*/
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
// HACK to allow building with the SDL backend on MinGW
// see bug #1800764 "TOOLS: MinGW tools building broken"
#ifdef main
diff --git a/tools/create_lure/process_actions.cpp b/tools/create_lure/process_actions.cpp
index 9779315ddd..30e7eed9e4 100644
--- a/tools/create_lure/process_actions.cpp
+++ b/tools/create_lure/process_actions.cpp
@@ -23,6 +23,9 @@
*
*/
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
#include "common/scummsys.h"
#include "common/util.h"
#include "create_lure_dat.h"
diff --git a/tools/create_teenagent/create_teenagent.cpp b/tools/create_teenagent/create_teenagent.cpp
index 930f40581f..ae88cc5d65 100644
--- a/tools/create_teenagent/create_teenagent.cpp
+++ b/tools/create_teenagent/create_teenagent.cpp
@@ -23,6 +23,9 @@
*
*/
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
diff --git a/tools/create_teenagent/md5.cpp b/tools/create_teenagent/md5.cpp
index 58e6e73add..214b5ef7ed 100644
--- a/tools/create_teenagent/md5.cpp
+++ b/tools/create_teenagent/md5.cpp
@@ -23,6 +23,9 @@
*
*/
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
#include "md5.h"
#define GET_UINT32(n, b, i) (n) = READ_LE_UINT32(b + i)
diff --git a/tools/create_toon/create_toon.cpp b/tools/create_toon/create_toon.cpp
index e6253ae21f..3cf252cbcd 100644
--- a/tools/create_toon/create_toon.cpp
+++ b/tools/create_toon/create_toon.cpp
@@ -25,6 +25,9 @@
* data file, used by the game engine
*/
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
// HACK to allow building with the SDL backend on MinGW
// see bug #1800764 "TOOLS: MinGW tools building broken"
#ifdef main