thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

common/util.cpp needs fprintf; various std I/O functions are not used by anything in our code, so there is no need to emulate them -- mark these; my previous commits likely broke compilation of the DS backend, try to reduce the brokeness a bit

Browse source 
svn-id: r26023
This commit is contained in:
Max Horn 2007-03-08 17:36:52 +00:00
parent 8778f121e2
commit d19adc0514
3 changed files with 86 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

28
backends/fs/ds/ds-fs.cpp
View file

@ -27,8 +27,34 @@
#include "dsmain.h"
#include "gba_nds_fat.h"
namespace DS {
struct fileHandle {
int pos;
bool used;
char* data;
int size;
DSSaveFile* sramFile;
};
#define FILE DS::fileHandle
// FIXME: The following definition for stdin etc. are duplicated in common/util.cpp.
// This should be fixed, e.g. by moving this (and the declarations of fileHandle,
// the various functions etc.) into a separate header file which includes by util.cpp,
// file.cpp and ds-fs.cpp
#undef stderr
#undef stdout
#undef stdin
#define stdout ((DS::fileHandle*) -1)
#define stderr ((DS::fileHandle*) -2)
#define stdin ((DS::fileHandle*) -3)
//////////////////////////////////////////////////////////////
// DSFileSystemNode - Flash ROM file system using Zip files
//////////////////////////////////////////////////////////////
@ -434,7 +460,7 @@ FILE* std_fopen(const char* name, const char* mode) {
}
// MT_memoryReport();
return (fileHandle *) result;
return (FILE *) result;
}