aboutsummaryrefslogtreecommitdiff
path: root/backends/fs
diff options
context:
space:
mode:
authorMax Horn2011-05-03 18:25:30 +0200
committerMax Horn2011-05-03 18:25:30 +0200
commit7a0c64631dcd1202e0a92e62a06ca2015e891cc9 (patch)
treefab49272a830325fe9577497537c33e2d687e61d /backends/fs
parentb449b73f590217cae4144f082d063696c74a6db0 (diff)
downloadscummvm-rg350-7a0c64631dcd1202e0a92e62a06ca2015e891cc9.tar.gz
scummvm-rg350-7a0c64631dcd1202e0a92e62a06ca2015e891cc9.tar.bz2
scummvm-rg350-7a0c64631dcd1202e0a92e62a06ca2015e891cc9.zip
MACOSX: Try to fix compile errors triggered with certain Mac OS X SDK versions
Diffstat (limited to 'backends/fs')
-rw-r--r--backends/fs/posix/posix-fs-factory.cpp4
-rw-r--r--backends/fs/posix/posix-fs.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/backends/fs/posix/posix-fs-factory.cpp b/backends/fs/posix/posix-fs-factory.cpp
index a82b176daf..639f57ac06 100644
--- a/backends/fs/posix/posix-fs-factory.cpp
+++ b/backends/fs/posix/posix-fs-factory.cpp
@@ -24,7 +24,9 @@
#if defined(UNIX)
-// Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h.
+// 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
diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp
index 26b4464bb4..34edb78504 100644
--- a/backends/fs/posix/posix-fs.cpp
+++ b/backends/fs/posix/posix-fs.cpp
@@ -25,6 +25,8 @@
#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