diff options
| author | Max Horn | 2011-05-03 11:56:10 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-03 11:56:10 +0200 |
| commit | d67e450f7ab6a8bc7e174790bdf3b0dc1fff18ba (patch) | |
| tree | dfced31c49a1255adeb9559bb1f61178972a90db | |
| parent | bdc7414f80dbff795892d6a88963bdb2c12dbad7 (diff) | |
| download | scummvm-rg350-d67e450f7ab6a8bc7e174790bdf3b0dc1fff18ba.tar.gz scummvm-rg350-d67e450f7ab6a8bc7e174790bdf3b0dc1fff18ba.tar.bz2 scummvm-rg350-d67e450f7ab6a8bc7e174790bdf3b0dc1fff18ba.zip | |
DC: Fix various forbidden symbol clashes
| -rw-r--r-- | backends/platform/dc/dc-fs.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/dc/dcmain.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/dc/selector.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/dc/vmsave.cpp | 2 |
4 files changed, 10 insertions, 0 deletions
diff --git a/backends/platform/dc/dc-fs.cpp b/backends/platform/dc/dc-fs.cpp index e21a12fa33..e07dfbfd9b 100644 --- a/backends/platform/dc/dc-fs.cpp +++ b/backends/platform/dc/dc-fs.cpp @@ -22,6 +22,10 @@ * $Id$ */ +// Avoid clashes with unistd.h +#define FORBIDDEN_SYMBOL_EXCEPTION_chdir +#define FORBIDDEN_SYMBOL_EXCEPTION_unlink + #include "dc.h" #include "backends/fs/abstract-fs.h" #include "backends/fs/stdiostream.h" diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp index 0f52cda458..a3a1200178 100644 --- a/backends/platform/dc/dcmain.cpp +++ b/backends/platform/dc/dcmain.cpp @@ -26,6 +26,8 @@ // Allow use of stuff in <time.h> #define FORBIDDEN_SYMBOL_EXCEPTION_time_h +#define FORBIDDEN_SYMBOL_EXCEPTION_printf + #include <common/scummsys.h> #include <engines/engine.h> #include <base/main.h> diff --git a/backends/platform/dc/selector.cpp b/backends/platform/dc/selector.cpp index 8fd12d66bf..77f34394a1 100644 --- a/backends/platform/dc/selector.cpp +++ b/backends/platform/dc/selector.cpp @@ -23,6 +23,8 @@ * */ +#define FORBIDDEN_SYMBOL_EXCEPTION_chdir + #include <common/scummsys.h> #include <engines/engine.h> #include <engines/metaengine.h> diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp index 1d7773b143..63e345efbe 100644 --- a/backends/platform/dc/vmsave.cpp +++ b/backends/platform/dc/vmsave.cpp @@ -26,6 +26,8 @@ // Allow use of stuff in <time.h> #define FORBIDDEN_SYMBOL_EXCEPTION_time_h +#define FORBIDDEN_SYMBOL_EXCEPTION_fprintf + #include <common/scummsys.h> #include "engines/engine.h" #include "dc.h" |