aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2011-05-03 11:27:44 +0200
committerMax Horn2011-05-03 11:27:44 +0200
commit3d4e9fe674d2daf59ff4b481fc2f89f77b390a4f (patch)
tree4141b74cc075e91f5bc094af0e27d7a17ed884e6
parent3201bb46bdfb0742b7a5464d59aaa672e1a5f022 (diff)
downloadscummvm-rg350-3d4e9fe674d2daf59ff4b481fc2f89f77b390a4f.tar.gz
scummvm-rg350-3d4e9fe674d2daf59ff4b481fc2f89f77b390a4f.tar.bz2
scummvm-rg350-3d4e9fe674d2daf59ff4b481fc2f89f77b390a4f.zip
BACKENDS: Allow various files to use stuff from time.h
-rw-r--r--backends/events/webossdl/webossdl-events.cpp3
-rw-r--r--backends/platform/android/android.cpp3
-rw-r--r--backends/platform/dc/dcmain.cpp3
-rw-r--r--backends/platform/dc/vmsave.cpp3
-rw-r--r--backends/platform/ds/arm9/source/fat/gba_nds_fat.c3
-rw-r--r--backends/platform/ds/arm9/source/osystem_ds.cpp3
-rw-r--r--backends/platform/psp/osys_psp.cpp3
-rw-r--r--backends/platform/sdl/sdl.cpp1
-rw-r--r--backends/platform/wii/osystem.cpp3
9 files changed, 24 insertions, 1 deletions
diff --git a/backends/events/webossdl/webossdl-events.cpp b/backends/events/webossdl/webossdl-events.cpp
index 045d077af2..24aa5f0abd 100644
--- a/backends/events/webossdl/webossdl-events.cpp
+++ b/backends/events/webossdl/webossdl-events.cpp
@@ -25,6 +25,9 @@
#ifdef WEBOS
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
#include "common/scummsys.h"
#include "common/system.h"
#include "sys/time.h"
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index c7f62f523b..7cf1e988fc 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -25,6 +25,9 @@
#if defined(__ANDROID__)
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/system_properties.h>
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index f9640130d3..0f52cda458 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -23,6 +23,9 @@
*
*/
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
#include <common/scummsys.h>
#include <engines/engine.h>
#include <base/main.h>
diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp
index 6c8289684f..1d7773b143 100644
--- a/backends/platform/dc/vmsave.cpp
+++ b/backends/platform/dc/vmsave.cpp
@@ -23,6 +23,9 @@
*
*/
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
#include <common/scummsys.h>
#include "engines/engine.h"
#include "dc.h"
diff --git a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
index 7f0757ef53..698590418c 100644
--- a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
+++ b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
@@ -18,6 +18,9 @@
//---------------------------------------------------------------
// Includes
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
#include "gba_nds_fat.h"
#include "disc_io.h"
#include <string.h>
diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index 49818a0034..462990cb32 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -20,6 +20,9 @@
*/
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
#include "common/scummsys.h"
#include "common/system.h"
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp
index bb7c1ff7d5..e2a8a88c57 100644
--- a/backends/platform/psp/osys_psp.cpp
+++ b/backends/platform/psp/osys_psp.cpp
@@ -23,6 +23,9 @@
*
*/
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
#include <pspuser.h>
#include <pspgu.h>
#include <pspdisplay.h>
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index bc27f8e954..e6ca423f61 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -25,7 +25,6 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
-
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
diff --git a/backends/platform/wii/osystem.cpp b/backends/platform/wii/osystem.cpp
index 54da27126c..ccf6b22db6 100644
--- a/backends/platform/wii/osystem.cpp
+++ b/backends/platform/wii/osystem.cpp
@@ -19,6 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
#include <unistd.h>
#include <ogc/conf.h>