From c8ad916710a7975ccfdd40ae2c3e1e25ca4a0e95 Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Wed, 11 May 2016 14:32:02 +0000
Subject: [PATCH] Use FPC_NO_DEFAULT_MEMORYMANAGER define to guard
SysGetmem/SysFreemem function definitions, also used for msdos OS
git-svn-id: trunk@33677 -
---
rtl/inc/heaph.inc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/rtl/inc/heaph.inc b/rtl/inc/heaph.inc
index 052e7e9ce4..7227007b1e 100644
--- a/rtl/inc/heaph.inc
+++ b/rtl/inc/heaph.inc
@@ -65,7 +65,11 @@ const
var
ReturnNilIfGrowHeapFails : boolean;
-{$ifndef EMBEDDED}
+{$ifdef EMBEDDED}
+ {$define FPC_NO_DEFAULT_MEMORYMANAGER}
+{$endif EMBEDDED}
+
+{$ifndef FPC_NO_DEFAULT_MEMORYMANAGER}
{ Default MemoryManager functions }
Function SysGetmem(Size:ptruint):Pointer;
Function SysFreemem(p:pointer):ptruint;
@@ -76,7 +80,7 @@ function SysTryResizeMem(var p:pointer;size:ptruint):boolean;
Function SysReAllocMem(var p:pointer;size:ptruint):Pointer;
function SysGetHeapStatus:THeapStatus;
function SysGetFPCHeapStatus:TFPCHeapStatus;
-{$endif EMBEDDED}
+{$endif FPC_NO_DEFAULT_MEMORYMANAGER}
{$ifdef FPC_HAS_FEATURE_HEAP}
{ Tp7 functions }