diff options
Diffstat (limited to 'backends/fs')
| -rw-r--r-- | backends/fs/ps2/ps2-fs.cpp | 6 | ||||
| -rw-r--r-- | backends/fs/stdiostream.cpp | 24 |
2 files changed, 2 insertions, 28 deletions
diff --git a/backends/fs/ps2/ps2-fs.cpp b/backends/fs/ps2/ps2-fs.cpp index c8d27e4890..0968ecc9d3 100644 --- a/backends/fs/ps2/ps2-fs.cpp +++ b/backends/fs/ps2/ps2-fs.cpp @@ -23,11 +23,9 @@ */ #include "backends/fs/abstract-fs.h" -#include "backends/fs/stdiostream.h" #include <kernel.h> #include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include "backends/platform/ps2/asyncfio.h" #include "backends/platform/ps2/fileio.h" #include "backends/platform/ps2/systemps2.h" @@ -504,10 +502,10 @@ const char *Ps2FilesystemNode::getDeviceDescription() const { } Common::SeekableReadStream *Ps2FilesystemNode::createReadStream() { - Common::SeekableReadStream *ss = StdioStream::makeFromPath(getPath().c_str(), false); + Common::SeekableReadStream *ss = PS2FileStream::makeFromPath(getPath().c_str(), false); return ss; } Common::WriteStream *Ps2FilesystemNode::createWriteStream() { - return StdioStream::makeFromPath(getPath().c_str(), true); + return PS2FileStream::makeFromPath(getPath().c_str(), true); } diff --git a/backends/fs/stdiostream.cpp b/backends/fs/stdiostream.cpp index 07c631b3ad..8845d796c6 100644 --- a/backends/fs/stdiostream.cpp +++ b/backends/fs/stdiostream.cpp @@ -25,30 +25,6 @@ #include "backends/fs/stdiostream.h" -#ifdef __PLAYSTATION2__ - // for those replaced fopen/fread/etc functions - #include "backends/platform/ps2/fileio.h" - - #define fopen(a, b) ps2_fopen(a, b) - #define fclose(a) ps2_fclose(a) - #define fseek(a, b, c) ps2_fseek(a, b, c) - #define ftell(a) ps2_ftell(a) - #define feof(a) ps2_feof(a) - #define fread(a, b, c, d) ps2_fread(a, b, c, d) - #define fwrite(a, b, c, d) ps2_fwrite(a, b, c, d) - - #define fflush(a) ps2_fflush(a) // used in common/util.cpp - #define ferror(a) ps2_ferror(a) - #define clearerr(a) ps2_clearerr(a) - - //#define fgetc(a) ps2_fgetc(a) // not used - //#define fgets(a, b, c) ps2_fgets(a, b, c) // not used - //#define fputc(a, b) ps2_fputc(a, b) // not used - //#define fputs(a, b) ps2_fputs(a, b) // not used - - //#define fsize(a) ps2_fsize(a) // not used -- and it is not a standard function either -#endif - StdioStream::StdioStream(void *handle) : _handle(handle) { assert(handle); } |