aboutsummaryrefslogtreecommitdiff
path: root/base/main.cpp
diff options
context:
space:
mode:
authorMax Horn2003-12-21 19:24:14 +0000
committerMax Horn2003-12-21 19:24:14 +0000
commit2e99e3f1f9de9e8a5da3b30d4acf7294f6b67689 (patch)
tree84ff2f0dd9ac67b7bd03ac3a83205432abae6482 /base/main.cpp
parent9c9ee18ff8f95b79e89c69767fafbbf9a69caa4e (diff)
downloadscummvm-rg350-2e99e3f1f9de9e8a5da3b30d4acf7294f6b67689.tar.gz
scummvm-rg350-2e99e3f1f9de9e8a5da3b30d4acf7294f6b67689.tar.bz2
scummvm-rg350-2e99e3f1f9de9e8a5da3b30d4acf7294f6b67689.zip
disable custom new/delete/free by default (only keep it around in case it comes in handy again in the future)
svn-id: r11839
Diffstat (limited to 'base/main.cpp')
-rw-r--r--base/main.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/base/main.cpp b/base/main.cpp
index 24c1a4d691..ea25c0f835 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -310,7 +310,8 @@ END_OF_MAIN();
#endif // WIN32_WCE
-#if !defined(__PALM_OS__) && !defined(MACOSX) && !defined(_WIN32_WCE)
+/*
+#if !defined(__PALM_OS__) && !defined(_WIN32_WCE)
void *operator new(size_t size) {
return memset(malloc(size), 0xE7, size);
}
@@ -331,3 +332,4 @@ void free_check(void *ptr) {
free(ptr);
}
#endif
+*/