aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorLars Persson2008-08-04 18:14:17 +0000
committerLars Persson2008-08-04 18:14:17 +0000
commit476e5bbb10743a8d15271363a6ccb2be1bc780e0 (patch)
treea48dd603b1ca4f76c31d9f8a9053606734949700 /common
parent4900a3e96ec7bb8ce2414776f55f96d8c84ebb32 (diff)
downloadscummvm-rg350-476e5bbb10743a8d15271363a6ccb2be1bc780e0.tar.gz
scummvm-rg350-476e5bbb10743a8d15271363a6ccb2be1bc780e0.tar.bz2
scummvm-rg350-476e5bbb10743a8d15271363a6ccb2be1bc780e0.zip
List the correct engines in about,
updated actions with Lure (from WinCE). Increased min heap size to 5MB svn-id: r33618
Diffstat (limited to 'common')
-rw-r--r--common/hashmap.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/common/hashmap.h b/common/hashmap.h
index ab6e737d74..69f367de97 100644
--- a/common/hashmap.h
+++ b/common/hashmap.h
@@ -58,21 +58,19 @@
#include "common/str.h"
#include "common/util.h"
-// FIXME: Since this define is very system dependant,
-// it should be moved to the appropriate H file instead.
-// Portdefs might be a good location for example
-#if !defined(__SYMBIAN32__)
#define USE_HASHMAP_MEMORY_POOL
-#endif
-
#ifdef USE_HASHMAP_MEMORY_POOL
#include "common/memorypool.h"
// FIXME: we sadly can't assume standard C++ 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.
+
+// Symbian does not have <new> but the new operator
+#if !defined(__SYMBIAN32__)
#include <new>
#endif
+#endif
namespace Common {