From 2e99e3f1f9de9e8a5da3b30d4acf7294f6b67689 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 21 Dec 2003 19:24:14 +0000
Subject: disable custom new/delete/free by default (only keep it around in
 case it comes in handy again in the future)

svn-id: r11839
---
 base/main.cpp     | 4 +++-
 common/scummsys.h | 8 ++++----
 2 files changed, 7 insertions(+), 5 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
+*/
diff --git a/common/scummsys.h b/common/scummsys.h
index 100b69b928..637cd995fa 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -426,10 +426,9 @@ FORCEINLINE uint16 SWAP_BYTES_16(uint16 a) {
 	typedef int16 NewGuiColor;
 #endif
 
-#if !defined(__PALM_OS__) && !defined(MACOSX)
-	/* Initialized operator new */
-	// FIXME - get rid of these new/delete overrides!!! They conflict with the
-	// Standard C++ library, and they are only there to support lazy programmers anyway.
+/*
+#if !defined(__PALM_OS__)
+	// Initialized operator new
 	void * operator new(size_t size);
 	void operator delete(void *ptr);
 	
@@ -442,5 +441,6 @@ FORCEINLINE uint16 SWAP_BYTES_16(uint16 a) {
 	void free_check(void *ptr);
 	#endif
 #endif
+*/
 
 #endif
-- 
cgit v1.2.3