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

* Handle potential double defintion of INFINITE

Browse Source
This commit is contained in:
Michaël Van Canneyt 2024-02-24 19:52:00 +01:00
parent b2dfcd6ee8
commit b3800d38cb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/inc/objpash.inc
View File

@ -641,7 +641,7 @@
end; end;
const const
INFINITE = Cardinal($FFFFFFFF); INFINITE = CARDINAL($FFFFFFFF);
function MonitorEnter(Const aObject: TObject; aTimeout: Cardinal = INFINITE): Boolean; inline; function MonitorEnter(Const aObject: TObject; aTimeout: Cardinal = INFINITE): Boolean; inline;
function MonitorTryEnter(Const aObject: TObject): Boolean; inline; function MonitorTryEnter(Const aObject: TObject): Boolean; inline;

2
rtl/win/sysos.inc
View File

@ -21,7 +21,9 @@ const
INVALID_HANDLE_VALUE = THandle(-1); INVALID_HANDLE_VALUE = THandle(-1);
IGNORE = 0; { Ignore signal } IGNORE = 0; { Ignore signal }
{$IF NOT DECLARED(INFINITE)}
INFINITE = longint($FFFFFFFF); { Infinite timeout } INFINITE = longint($FFFFFFFF); { Infinite timeout }
{$ENDIF}
{ flags for CreateFile } { flags for CreateFile }
GENERIC_READ=$80000000; GENERIC_READ=$80000000;