diff options
| author | Max Horn | 2011-05-03 14:30:25 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-03 14:30:25 +0200 |
| commit | 2fa63ca01586c4e5fda8eb12dca444d47a2375f1 (patch) | |
| tree | 5edf495f2d7c5a7712c4a9a90c7e684d4837eec4 /backends/fs | |
| parent | a50c36d1381be2e7d0748a2c734e41357fd4920f (diff) | |
| download | scummvm-rg350-2fa63ca01586c4e5fda8eb12dca444d47a2375f1.tar.gz scummvm-rg350-2fa63ca01586c4e5fda8eb12dca444d47a2375f1.tar.bz2 scummvm-rg350-2fa63ca01586c4e5fda8eb12dca444d47a2375f1.zip | |
COMMON: Forbid use of getcwd&getwd; add macro to enable unistd.h compatibility
Diffstat (limited to 'backends/fs')
| -rw-r--r-- | backends/fs/n64/n64-fs.cpp | 2 | ||||
| -rw-r--r-- | backends/fs/posix/posix-fs-factory.cpp | 3 | ||||
| -rw-r--r-- | backends/fs/posix/posix-fs.cpp | 5 | ||||
| -rw-r--r-- | backends/fs/psp/psp-fs-factory.cpp | 4 | ||||
| -rw-r--r-- | backends/fs/psp/psp-fs.cpp | 6 | ||||
| -rw-r--r-- | backends/fs/wii/wii-fs.cpp | 4 |
6 files changed, 10 insertions, 14 deletions
diff --git a/backends/fs/n64/n64-fs.cpp b/backends/fs/n64/n64-fs.cpp index 75c1e0bea0..a56a4947e8 100644 --- a/backends/fs/n64/n64-fs.cpp +++ b/backends/fs/n64/n64-fs.cpp @@ -22,6 +22,8 @@ #ifdef __N64__ +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h + #include "backends/fs/n64/n64-fs.h" #include "backends/fs/n64/romfsstream.h" diff --git a/backends/fs/posix/posix-fs-factory.cpp b/backends/fs/posix/posix-fs-factory.cpp index a69cf6b3b4..a82b176daf 100644 --- a/backends/fs/posix/posix-fs-factory.cpp +++ b/backends/fs/posix/posix-fs-factory.cpp @@ -25,9 +25,8 @@ #if defined(UNIX) // Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h. -#define FORBIDDEN_SYMBOL_EXCEPTION_chdir +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir -#define FORBIDDEN_SYMBOL_EXCEPTION_unlink #include "backends/fs/posix/posix-fs-factory.h" #include "backends/fs/posix/posix-fs.h" diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp index 7aa17e5cc1..26b4464bb4 100644 --- a/backends/fs/posix/posix-fs.cpp +++ b/backends/fs/posix/posix-fs.cpp @@ -24,10 +24,9 @@ #if defined(UNIX) -// Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h. -#define FORBIDDEN_SYMBOL_EXCEPTION_chdir +// Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h. +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir -#define FORBIDDEN_SYMBOL_EXCEPTION_unlink #include "backends/fs/posix/posix-fs.h" #include "backends/fs/stdiostream.h" diff --git a/backends/fs/psp/psp-fs-factory.cpp b/backends/fs/psp/psp-fs-factory.cpp index 6b0364b57e..aee541d12a 100644 --- a/backends/fs/psp/psp-fs-factory.cpp +++ b/backends/fs/psp/psp-fs-factory.cpp @@ -38,9 +38,7 @@ // for the PSP port #define FORBIDDEN_SYMBOL_EXCEPTION_printf -// Avoid clashes with unistd.h -#define FORBIDDEN_SYMBOL_EXCEPTION_chdir -#define FORBIDDEN_SYMBOL_EXCEPTION_unlink +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h #include "backends/fs/psp/psp-fs-factory.h" #include "backends/fs/psp/psp-fs.h" diff --git a/backends/fs/psp/psp-fs.cpp b/backends/fs/psp/psp-fs.cpp index b36b7a017c..908430b2f9 100644 --- a/backends/fs/psp/psp-fs.cpp +++ b/backends/fs/psp/psp-fs.cpp @@ -40,11 +40,9 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_time_h -#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h -// Avoid clashes with unistd.h -#define FORBIDDEN_SYMBOL_EXCEPTION_chdir -#define FORBIDDEN_SYMBOL_EXCEPTION_unlink +#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir #include "backends/fs/psp/psp-fs.h" #include "backends/fs/psp/psp-stream.h" diff --git a/backends/fs/wii/wii-fs.cpp b/backends/fs/wii/wii-fs.cpp index 74c7cf944c..eb631df1bf 100644 --- a/backends/fs/wii/wii-fs.cpp +++ b/backends/fs/wii/wii-fs.cpp @@ -23,9 +23,9 @@ #if defined(__WII__) #define FORBIDDEN_SYMBOL_EXCEPTION_time_h -#define FORBIDDEN_SYMBOL_EXCEPTION_chdir +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h + #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir -#define FORBIDDEN_SYMBOL_EXCEPTION_unlink #include "backends/fs/wii/wii-fs.h" #include "backends/fs/wii/wii-fs-factory.h" |