From 5647637ea2d239681a9dc0facc4071e33235fe4f Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Thu, 17 Nov 2011 12:44:05 +0100 Subject: COMMON: Move include into scummsys.h. The header contains forbidden symbols on some platforms, and the simplest solution seems to be to include it here. This also includes it from all the portdefs.h files, except the Symbian one. Probably the FIXME and the #if can be removed once it's known to work. --- common/memory.h | 10 ---------- common/scummsys.h | 9 +++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'common') diff --git a/common/memory.h b/common/memory.h index 1870850d27..0e5a97c20b 100644 --- a/common/memory.h +++ b/common/memory.h @@ -24,16 +24,6 @@ #include "common/scummsys.h" -// FIXME: We sadly can't assume standard C++ headers to be present on every -// system we support, so we should get rid of this. The solution should be to -// write a simple placement new on our own. It might be noteworthy we can't -// easily do that for systems which do have a , since it might clash with -// the default definition otherwise! -// Symbian does not have but the new operator -#if !defined(__SYMBIAN32__) -#include -#endif - namespace Common { /** diff --git a/common/scummsys.h b/common/scummsys.h index fbd5bb5273..6baab7c16f 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -130,6 +130,15 @@ #define _USE_MATH_DEFINES #include + // FIXME: We sadly can't assume standard C++ headers to be present on every + // system we support, so we should get rid of this. The solution should be to + // write a simple placement new on our own. It might be noteworthy we can't + // easily do that for systems which do have a , since it might clash with + // the default definition otherwise! + // Symbian does not have but the new operator + #if !defined(__SYMBIAN32__) + #include + #endif #endif -- cgit v1.2.3