sync with scummvm

This commit is contained in:
Pawel Kolodziejski 2011-05-08 15:38:26 +02:00
parent ce9e1899e4
commit 0f5de71f70
110 changed files with 1342 additions and 544 deletions

View file

@ -24,6 +24,12 @@
#if defined(UNIX)
// Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h.
// Also with clock() in sys/time.h in some Mac OS X SDKs.
#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
#include "backends/fs/posix/posix-fs.h"
#include "backends/fs/stdiostream.h"
#include "common/algorithm.h"
@ -238,11 +244,11 @@ AbstractFSNode *POSIXFilesystemNode::getParent() const {
}
Common::SeekableReadStream *POSIXFilesystemNode::createReadStream() {
return StdioStream::makeFromPath(getPath().c_str(), false);
return StdioStream::makeFromPath(getPath(), false);
}
Common::WriteStream *POSIXFilesystemNode::createWriteStream() {
return StdioStream::makeFromPath(getPath().c_str(), true);
return StdioStream::makeFromPath(getPath(), true);
}
#endif //#if defined(UNIX)