aboutsummaryrefslogtreecommitdiff
path: root/backends/platform
diff options
context:
space:
mode:
authorMax Horn2011-05-03 14:30:25 +0200
committerMax Horn2011-05-03 14:30:25 +0200
commit2fa63ca01586c4e5fda8eb12dca444d47a2375f1 (patch)
tree5edf495f2d7c5a7712c4a9a90c7e684d4837eec4 /backends/platform
parenta50c36d1381be2e7d0748a2c734e41357fd4920f (diff)
downloadscummvm-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/platform')
-rw-r--r--backends/platform/dc/dc-fs.cpp4
-rw-r--r--backends/platform/ps2/savefilemgr.cpp3
-rw-r--r--backends/platform/samsungtv/main.cpp2
-rw-r--r--backends/platform/webos/main.cpp2
-rw-r--r--backends/platform/wii/main.cpp1
5 files changed, 7 insertions, 5 deletions
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>