+ Removed HASGETHEAPSTATUS HASGETFPCHEAPSTATUS defines

git-svn-id: trunk@311 -

rtl/inc/cmem.pp

@@ -126,7 +126,6 @@ begin
   CMemSize:=pptrint(p-sizeof(ptrint))^;
 end;
 
-{$ifdef HASGETFPCHEAPSTATUS}  
 function CGetHeapStatus:THeapStatus;
 
 var res: THeapStatus;
@@ -141,14 +140,6 @@ function CGetFPCHeapStatus:TFPCHeapStatus;
 begin
   fillchar(CGetFPCHeapStatus,sizeof(CGetFPCHeapStatus),0);
 end;
-{$else HASGETFPCHEAPSTATUS}  
-Procedure CGetHeapStatus(var status:THeapStatus);
-
-begin
-  fillchar(status,sizeof(status),0);
-end;
-{$endif HASGETFPCHEAPSTATUS}  
-
 
 Const
  CMemoryManager : TMemoryManager =
@@ -161,9 +152,7 @@ Const
       ReallocMem : @CReAllocMem;
       MemSize : @CMemSize;
       GetHeapStatus : @CGetHeapStatus;
-{$ifdef HASGETFPCHEAPSTATUS}  
       GetFPCHeapStatus: @CGetFPCHeapStatus;	
-{$endif HASGETFPCHEAPSTATUS}  
     );
 
 Var

rtl/inc/heap.inc

@@ -70,9 +70,7 @@ const
     ReAllocMem: @SysReAllocMem;
     MemSize: @SysMemSize;
     GetHeapStatus: @SysGetHeapStatus;
-{$ifdef HASGETFPCHEAPSTATUS}
     GetFPCHeapStatus: @SysGetFPCHeapStatus;
-{$endif HASGETFPCHEAPSTATUS}
   );
 
   MemoryMutexManager: TMemoryMutexManager = (
@@ -130,11 +128,7 @@ type
   pfreelists   = ^tfreelists;
 
 var
-{$ifdef HASGETFPCHEAPSTATUS}
   internal_status : TFPCHeapStatus;
-{$else HASGETFPCHEAPSTATUS}
-  internal_status : THeapStatus;
-{$endif HASGETFPCHEAPSTATUS}
 
   freelists_fixed    : tfreelists;
   freelist_var       : pmemchunk_var;
@@ -265,7 +259,6 @@ begin
 end;
 
 
-{$ifdef HASGETFPCHEAPSTATUS}
 function GetHeapStatus:THeapStatus;
 begin
   if IsMultiThread and MemoryManager.NeedLock then
@@ -300,25 +293,6 @@ begin
      Result:=MemoryManager.GetFPCHeapStatus();
    end;
 end;
-{$else HASGETFPCHEAPSTATUS}
-procedure GetHeapStatus(var status:THeapStatus);
-begin
-  if IsMultiThread and MemoryManager.NeedLock then
-   begin
-     try
-       MemoryMutexManager.MutexLock;
-       MemoryManager.GetHeapStatus(status);
-     finally
-       MemoryMutexManager.MutexUnlock;
-     end;
-   end
-  else
-   begin
-     MemoryManager.GetHeapStatus(status);
-   end;
-end;
-{$endif HASGETFPCHEAPSTATUS}
-
 
 
 function MemSize(p:pointer):ptrint;
@@ -467,27 +441,10 @@ begin
 end;
 
 
-{ Bootstrapping }
-{$ifndef HASGETHEAPSTATUS}
-Function  Memavail:ptrint;
-begin
-  result:=0;
-end;
-Function  Maxavail:ptrint;
-begin
-  result:=0;
-end;
-Function  Heapsize:ptrint;
-begin
-  result:=0;
-end;
-{$endif HASGETHEAPSTATUS}
-
 {*****************************************************************************
                                GetHeapStatus
 *****************************************************************************}
 
-{$ifdef HASGETFPCHEAPSTATUS}
 function SysGetFPCHeapStatus:TFPCHeapStatus;
 begin
   internal_status.CurrHeapFree:=internal_status.CurrHeapSize-internal_status.CurrHeapUsed;
@@ -509,14 +466,6 @@ begin
   result.Overhead         :=0;
   result.HeapErrorCode    :=0;
 end;
-{$else}
-procedure SysGetHeapStatus(var status:THeapStatus);
-begin
-  internal_status.CurrHeapFree:=internal_status.CurrHeapSize-internal_status.CurrHeapUsed;
-  status:=internal_status;
-end;
-{$endif HASGETFPCHEAPSTATUS}
-
 
 
 {$ifdef DUMPBLOCKS}   // TODO

rtl/inc/heaph.inc

@@ -15,7 +15,6 @@
 
 { Memorymanager }
 type
-{$ifdef HASGETFPCHEAPSTATUS}
   TFPCHeapStatus = record
     MaxHeapSize,
     MaxHeapUsed,
@@ -35,15 +34,6 @@ type
     Overhead: Cardinal;
     HeapErrorCode: Cardinal;
   end;
-{$else HASGETFPCHEAPSTATUS}
-  THeapStatus = record
-    MaxHeapSize,
-    MaxHeapUsed,
-    CurrHeapSize,
-    CurrHeapUsed,
-    CurrHeapFree  : ptrint;
-  end;
-{$endif HASGETFPCHEAPSTATUS}
 
   PMemoryManager = ^TMemoryManager;
   TMemoryManager = record
@@ -54,12 +44,8 @@ type
     AllocMem            : Function(Size:ptrint):Pointer;
     ReAllocMem          : Function(var p:pointer;Size:ptrint):Pointer;
     MemSize             : function(p:pointer):ptrint;
-{$ifdef HASGETFPCHEAPSTATUS}
     GetHeapStatus       : function :THeapStatus;
     GetFPCHeapStatus    : function :TFPCHeapStatus;
-{$else HASGETFPCHEAPSTATUS}
-    GetHeapStatus : procedure(var status:THeapStatus);
-{$endif HASGETFPCHEAPSTATUS}
   end;
 
   TMemoryMutexManager = record
@@ -92,12 +78,8 @@ Function  SysMemSize(p:pointer):ptrint;
 Function  SysAllocMem(size:ptrint):Pointer;
 function  SysTryResizeMem(var p:pointer;size : ptrint):boolean;
 Function  SysReAllocMem(var p:pointer;size:ptrint):Pointer;
-{$ifdef HASGETFPCHEAPSTATUS}
 function  SysGetHeapStatus:THeapStatus;
 function  SysGetFPCHeapStatus:TFPCHeapStatus;
-{$else}
-procedure SysGetHeapStatus(var status:THeapStatus);
-{$endif HASGETFPCHEAPSTATUS}
 
 { Tp7 functions }
 Procedure Getmem(Var p:pointer;Size:ptrint);
@@ -116,17 +98,8 @@ function Freememory(p:pointer):ptrint;
 function AllocMem(Size:ptrint):pointer;
 function ReAllocMem(var p:pointer;Size:ptrint):pointer;
 function ReAllocMemory(var p:pointer;Size:ptrint):pointer;
-{$ifdef HASGETFPCHEAPSTATUS}
 function GetHeapStatus:THeapStatus;
 function GetFPCHeapStatus:TFPCHeapStatus;
-{$else}
-procedure GetHeapStatus(var status:THeapStatus);
-{$endif HASGETFPCHEAPSTATUS}
 
 { Bootstrapping }
-{$ifndef HASGETHEAPSTATUS}
-Function  Memavail:ptrint;
-Function  Maxavail:ptrint;
-Function  Heapsize:ptrint;
-{$endif HASGETHEAPSTATUS}
 

rtl/inc/heaptrc.pp

@@ -867,22 +867,14 @@ var
   pp : pheap_mem_info;
   i : ptrint;
   ExpectedHeapFree : ptrint;
-{$ifdef HASGETFPCHEAPSTATUS}
   status : TFPCHeapStatus;
-{$else HASGETFPCHEAPSTATUS}
-  status : THeapStatus;
-{$endif HASGETFPCHEAPSTATUS}
 begin
   pp:=heap_mem_root;
   Writeln(ptext^,'Heap dump by heaptrc unit');
   Writeln(ptext^,getmem_cnt, ' memory blocks allocated : ',getmem_size,'/',getmem8_size);
   Writeln(ptext^,freemem_cnt,' memory blocks freed     : ',freemem_size,'/',freemem8_size);
   Writeln(ptext^,getmem_cnt-freemem_cnt,' unfreed memory blocks : ',getmem_size-freemem_size);
-{$ifdef HASGETFPCHEAPSTATUS}
   status:=SysGetFPCHeapStatus;
-{$else HASGETFPCHEAPSTATUS}
-  SysGetHeapStatus(status);
-{$endif HASGETFPCHEAPSTATUS}
   Write(ptext^,'True heap size : ',status.CurrHeapSize);
   if EntryMemUsed > 0 then
     Writeln(ptext^,' (',EntryMemUsed,' used in System startup)')
@@ -959,7 +951,6 @@ end;
                             No specific tracing calls
 *****************************************************************************}
 
-{$ifdef HASGETFPCHEAPSTATUS}
 function TraceGetHeapStatus:THeapStatus;
 begin
   TraceGetHeapStatus:=SysGetHeapStatus;
@@ -969,12 +960,6 @@ function TraceGetFPCHeapStatus:TFPCHeapStatus;
 begin
     TraceGetFPCHeapStatus:=SysGetFPCHeapStatus;
 end;
-{$else HASGETFPCHEAPSTATUS}
-procedure TraceGetHeapStatus(var status:THeapStatus);
-begin
-  SysGetHeapStatus(status);
-end;
-{$endif HASGETFPCHEAPSTATUS}
 
 
 {*****************************************************************************
@@ -1025,28 +1010,16 @@ const
     AllocMem : @TraceAllocMem;
     ReAllocMem : @TraceReAllocMem;
     MemSize : @TraceMemSize;
-{$ifdef HASGETFPCHEAPSTATUS}
     GetHeapStatus : @TraceGetHeapStatus;
     GetFPCHeapStatus : @TraceGetFPCHeapStatus;
-{$else HASGETFPCHEAPSTATUS}
-    GetHeapStatus : @TraceGetHeapStatus;
-{$endif HASGETFPCHEAPSTATUS}
   );
 
 
 procedure TraceInit;
 var
-{$ifdef HASGETFPCHEAPSTATUS}
   initheapstatus : TFPCHeapStatus;
-{$else HASGETFPCHEAPSTATUS}
-  initheapstatus : THeapStatus;
-{$endif HASGETFPCHEAPSTATUS}
 begin
-{$ifdef HASGETFPCHEAPSTATUS}
   initheapstatus:=SysGetFPCHeapStatus;
-{$else HASGETFPCHEAPSTATUS}
-  SysGetHeapStatus(initheapstatus);
-{$endif HASGETFPCHEAPSTATUS}
   EntryMemUsed:=initheapstatus.CurrHeapUsed;
   MakeCRC32Tbl;
   SetMemoryManager(TraceManager);