From bac018a3aa1dea0282f5ba49f9eb2001737e8bee Mon Sep 17 00:00:00 2001 From: Max Horn Date: Thu, 18 Nov 2010 15:42:52 +0000 Subject: DS: Two more 'FILE' related fixes/workarounds svn-id: r54321 --- backends/fs/ds/ds-fs-factory.cpp | 3 +++ backends/fs/ds/ds-fs.cpp | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'backends/fs') 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 //basic print funcionality @@ -31,8 +34,6 @@ #include "dsmain.h" #include "fat/gba_nds_fat.h" - - namespace DS { ////////////////////////////////////////////////////////////// -- cgit v1.2.3