paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-07 05:08:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 338 via svnmerge from

Browse Source 
/trunk

git-svn-id: branches/fixes_2_0@339 -
This commit is contained in:
peter 2005-06-10 07:13:02 +00:00
parent d5b5b31afb
commit 03a7c3f6be
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fv/gadgets.pas
View File

@ -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----------------------------------------------------------------}

13
ide/fpcompil.pas
View File

@ -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(