[Scummvm-cvs-logs] scummvm master -> 265e03c97583bd12fd299499b798c967c7d1ab9a

joostp joostp at 7fc1.org
Sat Jun 4 17:00:28 CEST 2011


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:
265e03c975 IRIX: Fix compilation


Commit: 265e03c97583bd12fd299499b798c967c7d1ab9a
    https://github.com/scummvm/scummvm/commit/265e03c97583bd12fd299499b798c967c7d1ab9a
Author: Joost Peters (joostp at scummvm.org)
Date: 2011-06-04T07:55:58-07:00

Commit Message:
IRIX: Fix compilation

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 ccff8a8..829355b 100644
--- a/backends/fs/posix/posix-fs-factory.cpp
+++ b/backends/fs/posix/posix-fs-factory.cpp
@@ -26,6 +26,7 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 #define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
 #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
+#define FORBIDDEN_SYMBOL_EXCEPTION_exit		//Needed for IRIX's unistd.h
 
 #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 08a7601..0b94c37 100644
--- a/backends/fs/posix/posix-fs.cpp
+++ b/backends/fs/posix/posix-fs.cpp
@@ -27,6 +27,7 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
 #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
 #define FORBIDDEN_SYMBOL_EXCEPTION_getenv
+#define FORBIDDEN_SYMBOL_EXCEPTION_exit		//Needed for IRIX's unistd.h
 
 #include "backends/fs/posix/posix-fs.h"
 #include "backends/fs/stdiostream.h"






More information about the Scummvm-git-logs mailing list