* removed obsolete ifdefs

git-svn-id: trunk@338 -
This commit is contained in:
peter 2005-06-10 07:11:29 +00:00
parent 39efda1fde
commit d3f604154b
2 changed files with 1 additions and 21 deletions

View File

@ -179,23 +179,14 @@ end;
{ Update -> Platforms DOS/DPMI/WIN/NT/OS2 - Updated 12Nov99 LdB } { Update -> Platforms DOS/DPMI/WIN/NT/OS2 - Updated 12Nov99 LdB }
{---------------------------------------------------------------------------} {---------------------------------------------------------------------------}
PROCEDURE THeapView.Update; PROCEDURE THeapView.Update;
{$ifdef HASGETHEAPSTATUS}
var var
status : TFPCHeapStatus; status : TFPCHeapStatus;
{$endif HASGETHEAPSTATUS}
BEGIN BEGIN
{$ifdef HASGETHEAPSTATUS}
status:=GetFPCHeapStatus; status:=GetFPCHeapStatus;
If (OldMem <> status.CurrHeapUsed) Then Begin { Memory differs } If (OldMem <> status.CurrHeapUsed) Then Begin { Memory differs }
OldMem := status.CurrHeapUsed; { Hold memory avail } OldMem := status.CurrHeapUsed; { Hold memory avail }
DrawView; { Now redraw } DrawView; { Now redraw }
End; End;
{$else}
If (OldMem <> MemAvail) Then Begin { Memory differs }
OldMem := MemAvail; { Hold memory avail }
DrawView; { Now redraw }
End;
{$endif}
END; END;
{--THeapView----------------------------------------------------------------} {--THeapView----------------------------------------------------------------}

View File

@ -116,11 +116,7 @@ implementation
uses uses
{$ifdef Unix} {$ifdef Unix}
{$ifdef VER1_0} Unix, BaseUnix,
Linux,
{$else}
Unix, BaseUnix,
{$endif}
{$endif} {$endif}
{$ifdef go32v2} {$ifdef go32v2}
dpmiexcp, dpmiexcp,
@ -513,9 +509,7 @@ end;
procedure TCompilerStatusDialog.Update; procedure TCompilerStatusDialog.Update;
var var
StatusS,KeyS: string; StatusS,KeyS: string;
{$ifdef HASGETHEAPSTATUS}
hstatus : TFPCHeapStatus; hstatus : TFPCHeapStatus;
{$endif HASGETHEAPSTATUS}
const const
MaxFileNameSize = 46; MaxFileNameSize = 46;
begin begin
@ -574,14 +568,9 @@ begin
AddFormatParamStr(KillTilde(TargetSwitches^.ItemName(TargetSwitches^.GetCurrSel))); AddFormatParamStr(KillTilde(TargetSwitches^.ItemName(TargetSwitches^.GetCurrSel)));
AddFormatParamInt(Status.CurrentLine); AddFormatParamInt(Status.CurrentLine);
AddFormatParamInt(Status.CompiledLines); AddFormatParamInt(Status.CompiledLines);
{$ifdef HASGETHEAPSTATUS}
hstatus:=GetFPCHeapStatus; hstatus:=GetFPCHeapStatus;
AddFormatParamInt(hstatus.CurrHeapUsed div 1024); AddFormatParamInt(hstatus.CurrHeapUsed div 1024);
AddFormatParamInt(hstatus.CurrHeapSize div 1024); AddFormatParamInt(hstatus.CurrHeapSize div 1024);
{$else}
AddFormatParamInt((Heapsize-MemAvail) div 1024);
AddFormatParamInt(Heapsize div 1024);
{$endif}
AddFormatParamInt(Status.ErrorCount); AddFormatParamInt(Status.ErrorCount);
ST^.SetText( ST^.SetText(
FormatStrF( FormatStrF(