diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/memory.h | 10 | ||||
| -rw-r--r-- | common/scummsys.h | 9 |
2 files changed, 9 insertions, 10 deletions
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 <new>, since it might clash with -// the default definition otherwise! -// Symbian does not have <new> but the new operator -#if !defined(__SYMBIAN32__) -#include <new> -#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 <math.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 <new>, since it might clash with + // the default definition otherwise! + // Symbian does not have <new> but the new operator + #if !defined(__SYMBIAN32__) + #include <new> + #endif #endif |