aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2005-08-28 11:15:38 +0000
committerTravis Howell2005-08-28 11:15:38 +0000
commit7556e064d2752a12ddbe189340a1ef081b348ee7 (patch)
tree6e0c206c442f7f463883b76bfc68db78308d45aa
parent2174c6f49c042a2dc33c015089444651ec843ef0 (diff)
downloadscummvm-rg350-7556e064d2752a12ddbe189340a1ef081b348ee7.tar.gz
scummvm-rg350-7556e064d2752a12ddbe189340a1ef081b348ee7.tar.bz2
scummvm-rg350-7556e064d2752a12ddbe189340a1ef081b348ee7.zip
mingw can handle heap checking now.
NOTE: Requires mingw-runtime-3.8 svn-id: r18714
-rw-r--r--base/engine.cpp2
-rw-r--r--common/scummsys.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/base/engine.cpp b/base/engine.cpp
index d84728a2e0..a2c722ae6f 100644
--- a/base/engine.cpp
+++ b/base/engine.cpp
@@ -220,7 +220,7 @@ void CDECL warning(const char *s, ...) {
}
void checkHeap() {
-#if defined(_MSC_VER)
+#if defined(WIN32)
if (_heapchk() != _HEAPOK) {
error("Heap is invalid!");
}
diff --git a/common/scummsys.h b/common/scummsys.h
index ee569439aa..5b3b6205cd 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -85,8 +85,6 @@
#define scumm_strnicmp strnicmp
#define SCUMM_LITTLE_ENDIAN
- #define _HEAPOK 0
-
typedef unsigned char byte;
typedef unsigned char uint8;
typedef unsigned short uint16;