[Scummvm-cvs-logs] SF.net SVN: scummvm:[54321] scummvm/trunk/backends/fs/ds
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Nov 18 16:42:53 CET 2010
Revision: 54321
http://scummvm.svn.sourceforge.net/scummvm/?rev=54321&view=rev
Author: fingolfin
Date: 2010-11-18 15:42:52 +0000 (Thu, 18 Nov 2010)
Log Message:
-----------
DS: Two more 'FILE' related fixes/workarounds
Modified Paths:
--------------
scummvm/trunk/backends/fs/ds/ds-fs-factory.cpp
scummvm/trunk/backends/fs/ds/ds-fs.cpp
Modified: scummvm/trunk/backends/fs/ds/ds-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/ds/ds-fs-factory.cpp 2010-11-18 13:48:49 UTC (rev 54320)
+++ scummvm/trunk/backends/fs/ds/ds-fs-factory.cpp 2010-11-18 15:42:52 UTC (rev 54321)
@@ -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"
Modified: scummvm/trunk/backends/fs/ds/ds-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/ds/ds-fs.cpp 2010-11-18 13:48:49 UTC (rev 54320)
+++ scummvm/trunk/backends/fs/ds/ds-fs.cpp 2010-11-18 15:42:52 UTC (rev 54321)
@@ -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 {
//////////////////////////////////////////////////////////////
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list