Browse Source

rtl/heap: fix builds of systems that define HAS_MEMORYMANAGER after 78f7d0bd

Karoly Balogh 2 days ago
parent
commit
b8f789143a
1 changed files with 2 additions and 2 deletions
  1. 2 2
      rtl/inc/heaph.inc

+ 2 - 2
rtl/inc/heaph.inc

@@ -100,8 +100,8 @@ function ReAllocMemory(p:pointer;Size:ptruint):pointer; cdecl;
 function GetHeapStatus:THeapStatus;
 function GetFPCHeapStatus:TFPCHeapStatus;
 
-{$if defined(FPC_HAS_FEATURE_THREADING) and not defined(FPC_NO_DEFAULT_HEAP) and not defined(LEGACYHEAP)}
+{$if defined(FPC_HAS_FEATURE_THREADING) and not defined(FPC_NO_DEFAULT_HEAP) and not defined(HAS_MEMORYMANAGER) and not defined(LEGACYHEAP)}
 procedure DeferInitHeapProcessWide; inline; { for Windows sysinit.pp... }
 procedure DoneHeapProcessWide; inline;
-{$endif FPC_HAS_FEATURE_THREADING and not FPC_NO_DEFAULT_HEAP and not LEGACYHEAP}
+{$endif FPC_HAS_FEATURE_THREADING and not defined(FPC_NO_DEFAULT_HEAP) and not defined(HAS_MEMORYMANAGER) and not defined(LEGACYHEAP)}
 {$endif FPC_HAS_FEATURE_HEAP}