From d02e4d7f7c7affb4e6f52c0e5a9a8b5a0ca0c610 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 23 Sep 2006 11:29:32 +0000
Subject: Removed CHECK_HEAP

svn-id: r23979
---
 common/scummsys.h | 14 --------------
 common/util.cpp   |  8 --------
 common/util.h     |  2 --
 3 files changed, 24 deletions(-)

(limited to 'common')

diff --git a/common/scummsys.h b/common/scummsys.h
index 89621458b4..50226ce51e 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -97,11 +97,6 @@
 	// explains the reasons briefly.
 	#define SCUMMVM_USE_LONG_INT
 
-	#if defined(CHECK_HEAP)
-	#undef CHECK_HEAP
-	#define CHECK_HEAP checkHeap();
-	#endif
-
 	#define FORCEINLINE __forceinline
 	#define NORETURN _declspec(noreturn)
 	#define PLUGIN_EXPORT __declspec(dllexport)
@@ -320,11 +315,6 @@
 
 	#define SCUMM_LITTLE_ENDIAN
 
-	#if defined(CHECK_HEAP)
-	#undef CHECK_HEAP
-	#define CHECK_HEAP checkHeap();
-	#endif
-
 	#define FORCEINLINE __forceinline
 	#define NORETURN _declspec(noreturn)
 	#define PLUGIN_EXPORT __declspec(dllexport)
@@ -368,10 +358,6 @@
 #define FORCEINLINE inline
 #endif
 
-#ifndef CHECK_HEAP
-#define CHECK_HEAP
-#endif
-
 #ifndef CDECL
 #define	CDECL
 #endif
diff --git a/common/util.cpp b/common/util.cpp
index 6f4f3f1a67..694bd7fdfb 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -534,11 +534,3 @@ void CDECL warning(const char *s, ...) {
 #endif
 #endif
 }
-
-void checkHeap() {
-#if defined(WIN32) && !defined(__SYMBIAN32__)
-	if (_heapchk() != _HEAPOK) {
-		error("Heap is invalid!");
-	}
-#endif
-}
diff --git a/common/util.h b/common/util.h
index c55bee6c1d..6fb0e68a90 100644
--- a/common/util.h
+++ b/common/util.h
@@ -274,8 +274,6 @@ void CDECL debug(const char *s, ...) GCC_PRINTF(1, 2);
 void CDECL debugN(int level, const char *s, ...) GCC_PRINTF(2, 3);
 void CDECL debugC(int level, uint32 engine_level, const char *s, ...) GCC_PRINTF(3, 4);
 
-void checkHeap();
-
 extern int gDebugLevel;
 
 
-- 
cgit v1.2.3