diff options
| author | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
| commit | 224c71e483e09931ba386555ff3b436b9defe63d (patch) | |
| tree | 8e6178331a7bbd3ee1be318d3fc7a7c7f478468f /backends/fs | |
| parent | d4c92983920cfe3b25a22d91e12c750e591b917e (diff) | |
| parent | 547fd1bdcabcba0e741eb31100ba99ff73399d24 (diff) | |
| download | scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.gz scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.bz2 scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'backends/fs')
| -rw-r--r-- | backends/fs/posix/posix-fs-factory.cpp | 2 | ||||
| -rw-r--r-- | backends/fs/posix/posix-fs.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/backends/fs/posix/posix-fs-factory.cpp b/backends/fs/posix/posix-fs-factory.cpp index c94e90ccde..ccff8a8b42 100644 --- a/backends/fs/posix/posix-fs-factory.cpp +++ b/backends/fs/posix/posix-fs-factory.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if defined(UNIX) +#if defined(POSIX) // 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. diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp index 4d69a51a03..08a7601c17 100644 --- a/backends/fs/posix/posix-fs.cpp +++ b/backends/fs/posix/posix-fs.cpp @@ -19,13 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if defined(UNIX) +#if defined(POSIX) // 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 +#define FORBIDDEN_SYMBOL_EXCEPTION_getenv #include "backends/fs/posix/posix-fs.h" #include "backends/fs/stdiostream.h" @@ -248,4 +249,4 @@ Common::WriteStream *POSIXFilesystemNode::createWriteStream() { return StdioStream::makeFromPath(getPath(), true); } -#endif //#if defined(UNIX) +#endif //#if defined(POSIX) |