diff options
Diffstat (limited to 'backends')
| -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 | ||||
| -rw-r--r-- | backends/platform/dc/dc-fs.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/ps2/savefilemgr.cpp | 3 | ||||
| -rw-r--r-- | backends/platform/samsungtv/main.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/webos/main.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/wii/main.cpp | 1 |
11 files changed, 17 insertions, 19 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" diff --git a/backends/platform/dc/dc-fs.cpp b/backends/platform/dc/dc-fs.cpp index e07dfbfd9b..a024b5d70d 100644 --- a/backends/platform/dc/dc-fs.cpp +++ b/backends/platform/dc/dc-fs.cpp @@ -22,9 +22,7 @@ * $Id$ */ -// Avoid clashes with unistd.h -#define FORBIDDEN_SYMBOL_EXCEPTION_chdir -#define FORBIDDEN_SYMBOL_EXCEPTION_unlink +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h #include "dc.h" #include "backends/fs/abstract-fs.h" diff --git a/backends/platform/ps2/savefilemgr.cpp b/backends/platform/ps2/savefilemgr.cpp index 871ce11ef6..010357c61c 100644 --- a/backends/platform/ps2/savefilemgr.cpp +++ b/backends/platform/ps2/savefilemgr.cpp @@ -24,8 +24,7 @@ */ #define FORBIDDEN_SYMBOL_EXCEPTION_printf -#define FORBIDDEN_SYMBOL_EXCEPTION_chdir -#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h #include "common/config-manager.h" #include "common/zlib.h" diff --git a/backends/platform/samsungtv/main.cpp b/backends/platform/samsungtv/main.cpp index 3beb97165f..a1962dd904 100644 --- a/backends/platform/samsungtv/main.cpp +++ b/backends/platform/samsungtv/main.cpp @@ -23,6 +23,8 @@ * */ +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h + #include "backends/platform/samsungtv/samsungtv.h" #include "backends/plugins/sdl/sdl-provider.h" #include "base/main.h" diff --git a/backends/platform/webos/main.cpp b/backends/platform/webos/main.cpp index bbf55c6efd..eefdd30496 100644 --- a/backends/platform/webos/main.cpp +++ b/backends/platform/webos/main.cpp @@ -23,6 +23,8 @@ * */ +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h + #include "backends/platform/webos/webos.h" #include "backends/plugins/sdl/sdl-provider.h" #include "base/main.h" diff --git a/backends/platform/wii/main.cpp b/backends/platform/wii/main.cpp index 959931de00..3965f51b7f 100644 --- a/backends/platform/wii/main.cpp +++ b/backends/platform/wii/main.cpp @@ -20,6 +20,7 @@ */ #define FORBIDDEN_SYMBOL_EXCEPTION_chdir +#define FORBIDDEN_SYMBOL_EXCEPTION_getcwd #define FORBIDDEN_SYMBOL_EXCEPTION_printf #include <sys/stat.h> |