diff --git a/fv/gadgets.pas b/fv/gadgets.pas index 21d05d153c..b802f4f888 100644 --- a/fv/gadgets.pas +++ b/fv/gadgets.pas @@ -179,23 +179,14 @@ end; { Update -> Platforms DOS/DPMI/WIN/NT/OS2 - Updated 12Nov99 LdB } {---------------------------------------------------------------------------} PROCEDURE THeapView.Update; -{$ifdef HASGETHEAPSTATUS} var status : TFPCHeapStatus; -{$endif HASGETHEAPSTATUS} BEGIN -{$ifdef HASGETHEAPSTATUS} status:=GetFPCHeapStatus; If (OldMem <> status.CurrHeapUsed) Then Begin { Memory differs } OldMem := status.CurrHeapUsed; { Hold memory avail } DrawView; { Now redraw } End; -{$else} - If (OldMem <> MemAvail) Then Begin { Memory differs } - OldMem := MemAvail; { Hold memory avail } - DrawView; { Now redraw } - End; -{$endif} END; {--THeapView----------------------------------------------------------------} diff --git a/ide/fpcompil.pas b/ide/fpcompil.pas index 774a872001..4a71217076 100644 --- a/ide/fpcompil.pas +++ b/ide/fpcompil.pas @@ -116,11 +116,7 @@ implementation uses {$ifdef Unix} - {$ifdef VER1_0} - Linux, - {$else} - Unix, BaseUnix, - {$endif} + Unix, BaseUnix, {$endif} {$ifdef go32v2} dpmiexcp, @@ -513,9 +509,7 @@ end; procedure TCompilerStatusDialog.Update; var StatusS,KeyS: string; -{$ifdef HASGETHEAPSTATUS} hstatus : TFPCHeapStatus; -{$endif HASGETHEAPSTATUS} const MaxFileNameSize = 46; begin @@ -574,14 +568,9 @@ begin AddFormatParamStr(KillTilde(TargetSwitches^.ItemName(TargetSwitches^.GetCurrSel))); AddFormatParamInt(Status.CurrentLine); AddFormatParamInt(Status.CompiledLines); -{$ifdef HASGETHEAPSTATUS} hstatus:=GetFPCHeapStatus; AddFormatParamInt(hstatus.CurrHeapUsed div 1024); AddFormatParamInt(hstatus.CurrHeapSize div 1024); -{$else} - AddFormatParamInt((Heapsize-MemAvail) div 1024); - AddFormatParamInt(Heapsize div 1024); -{$endif} AddFormatParamInt(Status.ErrorCount); ST^.SetText( FormatStrF(