From 4e2962e6ae09388d278985619a6a366aed7091c4 Mon Sep 17 00:00:00 2001
From: nickysn <nickysn@gmail.com>
Date: Sat, 25 May 2013 19:22:31 +0000
Subject: [PATCH] - do not initialize the regular heap manager under
 i8086-msdos, so it can be smartlinked away

git-svn-id: trunk@24614 -
---
 rtl/inc/heap.inc    | 16 ++++++++--------
 rtl/msdos/system.pp |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/rtl/inc/heap.inc b/rtl/inc/heap.inc
index 3c9a99d17c..8d816ef074 100644
--- a/rtl/inc/heap.inc
+++ b/rtl/inc/heap.inc
@@ -22,17 +22,17 @@
 const
   MemoryManager: TMemoryManager = (
     NeedLock: false;  // Obsolete
-    GetMem: @SysGetMem;
-    FreeMem: @SysFreeMem;
-    FreeMemSize: @SysFreeMemSize;
-    AllocMem: @SysAllocMem;
-    ReAllocMem: @SysReAllocMem;
-    MemSize: @SysMemSize;
+    GetMem: {$ifndef FPC_NO_DEFAULT_HEAP}@SysGetMem{$else}nil{$endif};
+    FreeMem: {$ifndef FPC_NO_DEFAULT_HEAP}@SysFreeMem{$else}nil{$endif};
+    FreeMemSize: {$ifndef FPC_NO_DEFAULT_HEAP}@SysFreeMemSize{$else}nil{$endif};
+    AllocMem: {$ifndef FPC_NO_DEFAULT_HEAP}@SysAllocMem{$else}nil{$endif};
+    ReAllocMem: {$ifndef FPC_NO_DEFAULT_HEAP}@SysReAllocMem{$else}nil{$endif};
+    MemSize: {$ifndef FPC_NO_DEFAULT_HEAP}@SysMemSize{$else}nil{$endif};
     InitThread: nil;
     DoneThread: nil;
     RelocateHeap: nil;
-    GetHeapStatus: @SysGetHeapStatus;
-    GetFPCHeapStatus: @SysGetFPCHeapStatus;
+    GetHeapStatus: {$ifndef FPC_NO_DEFAULT_HEAP}@SysGetHeapStatus{$else}nil{$endif};
+    GetFPCHeapStatus: {$ifndef FPC_NO_DEFAULT_HEAP}@SysGetFPCHeapStatus{$else}nil{$endif};
   );
 {$else}
 {$ifndef FPC_IN_HEAPMGR}
diff --git a/rtl/msdos/system.pp b/rtl/msdos/system.pp
index 88bf01e7e7..fcb8b7fe37 100644
--- a/rtl/msdos/system.pp
+++ b/rtl/msdos/system.pp
@@ -4,6 +4,8 @@ unit system;
 
 interface
 
+{$DEFINE FPC_NO_DEFAULT_HEAP}
+
 {$DEFINE FPC_INCLUDE_SOFTWARE_MUL}
 {$DEFINE FPC_INCLUDE_SOFTWARE_MOD_DIV}