[Scummvm-cvs-logs] SF.net SVN: scummvm:[46104] scummvm/trunk/backends/fs/stdiostream.cpp
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Nov 23 23:28:14 CET 2009
Revision: 46104
http://scummvm.svn.sourceforge.net/scummvm/?rev=46104&view=rev
Author: fingolfin
Date: 2009-11-23 22:28:14 +0000 (Mon, 23 Nov 2009)
Log Message:
-----------
Remove obsolete OSX & NDS specific stuff from StdioStream code
Modified Paths:
--------------
scummvm/trunk/backends/fs/stdiostream.cpp
Modified: scummvm/trunk/backends/fs/stdiostream.cpp
===================================================================
--- scummvm/trunk/backends/fs/stdiostream.cpp 2009-11-23 22:27:52 UTC (rev 46103)
+++ scummvm/trunk/backends/fs/stdiostream.cpp 2009-11-23 22:28:14 UTC (rev 46104)
@@ -27,11 +27,6 @@
#include <errno.h>
-#if defined(MACOSX) || defined(IPHONE)
-#include "CoreFoundation/CoreFoundation.h"
-#endif
-
-
#ifdef __PLAYSTATION2__
// for those replaced fopen/fread/etc functions
typedef unsigned long uint64;
@@ -59,39 +54,6 @@
//#define fsize(a) ps2_fsize(a) // not used -- and it is not a standard function either
#endif
-#ifdef __DS__
-
- // These functions replace the standard library functions of the same name.
- // As this header is included after the standard one, I have the chance to #define
- // all of these to my own code.
- //
- // A #define is the only way, as redefinig the functions would cause linker errors.
-
- // These functions need to be #undef'ed, as their original definition
- // in devkitarm is done with #includes (ugh!)
- #undef feof
- #undef clearerr
- //#undef getc
- //#undef ferror
-
- #include "backends/fs/ds/ds-fs.h"
-
-
- // Only functions used in the ScummVM source have been defined here!
- #define fopen(name, mode) DS::std_fopen(name, mode)
- #define fclose(handle) DS::std_fclose(handle)
- #define fread(ptr, size, items, file) DS::std_fread(ptr, size, items, file)
- #define fwrite(ptr, size, items, file) DS::std_fwrite(ptr, size, items, file)
- #define feof(handle) DS::std_feof(handle)
- #define ftell(handle) DS::std_ftell(handle)
- #define fseek(handle, offset, whence) DS::std_fseek(handle, offset, whence)
- #define clearerr(handle) DS::std_clearerr(handle)
- #define fflush(file) DS::std_fflush(file)
- #undef ferror
- #define ferror(handle) DS::std_ferror(handle)
-
-#endif
-
StdioStream::StdioStream(void *handle) : _handle(handle) {
assert(handle);
}
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