paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-10 19:45:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Rename HeapSize to WinAPIHeapSize to avoid conflict with general function

Browse Source
This commit is contained in:
pierre 2002-06-04 09:25:14 +00:00
parent 6837e079bb
commit 215ed72a2d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rtl/win32/system.pp
View File

@ -289,7 +289,7 @@ end;
function HeapAlloc(hHeap : DWord; dwFlags : DWord; dwBytes : DWord) : Longint; function HeapAlloc(hHeap : DWord; dwFlags : DWord; dwBytes : DWord) : Longint;
external 'kernel32' name 'HeapAlloc'; external 'kernel32' name 'HeapAlloc';
{$IFDEF SYSTEMDEBUG} {$IFDEF SYSTEMDEBUG}
function HeapSize(hHeap : DWord; dwFlags : DWord; ptr : Pointer) : DWord; function WinAPIHeapSize(hHeap : DWord; dwFlags : DWord; ptr : Pointer) : DWord;
external 'kernel32' name 'HeapSize'; external 'kernel32' name 'HeapSize';
{$ENDIF} {$ENDIF}
@ -317,7 +317,7 @@ begin
if (l = 0) then if (l = 0) then
l := -1; l := -1;
{$ifdef DUMPGROW} {$ifdef DUMPGROW}
Writeln('new heap part at $',hexstr(l,8), ' size = ',HeapSize(GetProcessHeap())); Writeln('new heap part at $',hexstr(l,8), ' size = ',WinAPIHeapSize(GetProcessHeap()));
{$endif} {$endif}
sbrk:=l; sbrk:=l;
end; end;
@ -1282,8 +1282,7 @@ begin
error:=exceptError[exceptLevel]; error:=exceptError[exceptLevel];
{$ifdef SYSTEMEXCEPTIONDEBUG} {$ifdef SYSTEMEXCEPTIONDEBUG}
if IsConsole then if IsConsole then
writeln(stderr,'In JumpToHandleErrorFrame error=',error); writeln(stderr,'In JumpToHandleErrorFrame error=',error);
end;
{$endif SYSTEMEXCEPTIONDEBUG} {$endif SYSTEMEXCEPTIONDEBUG}
if resetFPU[exceptLevel] then asm if resetFPU[exceptLevel] then asm
fninit fninit
@ -1565,7 +1564,10 @@ end.
{ {
$Log$ $Log$
Revision 1.26 2002-04-12 17:45:13 carl Revision 1.27 2002-06-04 09:25:14 pierre
* Rename HeapSize to WinAPIHeapSize to avoid conflict with general function
Revision 1.26 2002/04/12 17:45:13 carl
+ generic stack checking + generic stack checking
Revision 1.25 2002/03/11 19:10:33 peter Revision 1.25 2002/03/11 19:10:33 peter