[Scummvm-cvs-logs] scummvm master -> e28b402295b92e080274a8b39869dd5f63c195f1

[joostp]

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


Commit: e28b402295b92e080274a8b39869dd5f63c195f1
    https://github.com/scummvm/scummvm/commit/e28b402295b92e080274a8b39869dd5f63c195f1
Author: Joost Peters (joostp at scummvm.org)
Date: 2011-05-07T16:25:09-07:00

Commit Message:
IRIX: Fix compilation

Changed paths:
    backends/midi/dmedia.cpp
    backends/platform/sdl/posix/posix.cpp
    backends/saves/posix/posix-saves.cpp



diff --git a/backends/midi/dmedia.cpp b/backends/midi/dmedia.cpp
index c4c1968..ba6d58d 100644
--- a/backends/midi/dmedia.cpp
+++ b/backends/midi/dmedia.cpp
@@ -34,9 +34,10 @@
 
 #if defined(IRIX)
 
-#include "common/scummsys.h"
-#include "common/util.h"
 #include "common/config-manager.h"
+#include "common/error.h"
+#include "common/textconsole.h"
+#include "common/util.h"
 #include "audio/musicplugin.h"
 #include "audio/mpu401.h"
 
diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
index 889bc5c..2208f7c 100644
--- a/backends/platform/sdl/posix/posix.cpp
+++ b/backends/platform/sdl/posix/posix.cpp
@@ -24,6 +24,7 @@
  */
 
 #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h	//On IRIX, sys/stat.h includes sys/time.h
 
 #include "common/scummsys.h"
 
diff --git a/backends/saves/posix/posix-saves.cpp b/backends/saves/posix/posix-saves.cpp
index 37db208..3a8e5e9 100644
--- a/backends/saves/posix/posix-saves.cpp
+++ b/backends/saves/posix/posix-saves.cpp
@@ -26,6 +26,7 @@
 
 // Enable mkdir
 #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h	//On IRIX, sys/stat.h includes sys/time.h
 
 #include "common/scummsys.h"