diff options
| author | Max Horn | 2010-11-18 15:42:52 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-18 15:42:52 +0000 |
| commit | bac018a3aa1dea0282f5ba49f9eb2001737e8bee (patch) | |
| tree | b6686dddb836ded19ea768457baf63f8a11fa4bd /backends/fs/ds | |
| parent | ffc6ed643f5b659d2bd95c50fda020c716b8dd4b (diff) | |
| download | scummvm-rg350-bac018a3aa1dea0282f5ba49f9eb2001737e8bee.tar.gz scummvm-rg350-bac018a3aa1dea0282f5ba49f9eb2001737e8bee.tar.bz2 scummvm-rg350-bac018a3aa1dea0282f5ba49f9eb2001737e8bee.zip | |
DS: Two more 'FILE' related fixes/workarounds
svn-id: r54321
Diffstat (limited to 'backends/fs/ds')
| -rw-r--r-- | backends/fs/ds/ds-fs-factory.cpp | 3 | ||||
| -rw-r--r-- | backends/fs/ds/ds-fs.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/backends/fs/ds/ds-fs-factory.cpp b/backends/fs/ds/ds-fs-factory.cpp index 0dfa70b716..2d4102eec6 100644 --- a/backends/fs/ds/ds-fs-factory.cpp +++ b/backends/fs/ds/ds-fs-factory.cpp @@ -22,6 +22,9 @@ * $Id$ */ +// Disable symbol overrides for FILE as that is used in FLAC headers +#define FORBIDDEN_SYMBOL_EXCEPTION_FILE + #if defined(__DS__) #include "backends/fs/ds/ds-fs-factory.h" #include "backends/fs/ds/ds-fs.h" diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp index cbc1c054fe..d977483852 100644 --- a/backends/fs/ds/ds-fs.cpp +++ b/backends/fs/ds/ds-fs.cpp @@ -23,6 +23,9 @@ * */ +// Disable symbol overrides for FILE as that is used in FLAC headers +#define FORBIDDEN_SYMBOL_EXCEPTION_FILE + #include "common/str.h" #include "common/util.h" //#include <NDS/ARM9/console.h> //basic print funcionality @@ -31,8 +34,6 @@ #include "dsmain.h" #include "fat/gba_nds_fat.h" - - namespace DS { ////////////////////////////////////////////////////////////// |