[Scummvm-cvs-logs] scummvm master -> 7a0c64631dcd1202e0a92e62a06ca2015e891cc9

[fingolfin]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7a0c64631d MACOSX: Try to fix compile errors triggered with certain Mac OS X SDK versions


Commit: 7a0c64631dcd1202e0a92e62a06ca2015e891cc9
    https://github.com/scummvm/scummvm/commit/7a0c64631dcd1202e0a92e62a06ca2015e891cc9
Author: Max Horn (max at quendi.de)
Date: 2011-05-03T09:25:30-07:00

Commit Message:
MACOSX: Try to fix compile errors triggered with certain Mac OS X SDK versions

Changed paths:
    backends/fs/posix/posix-fs-factory.cpp
    backends/fs/posix/posix-fs.cpp



diff --git a/backends/fs/posix/posix-fs-factory.cpp b/backends/fs/posix/posix-fs-factory.cpp
index a82b176..639f57a 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 26b4464..34edb78 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