瀏覽代碼

* Handle potential double defintion of INFINITE

Michaël Van Canneyt 1 年之前
父節點
當前提交
b3800d38cb
共有 2 個文件被更改,包括 3 次插入1 次删除
  1. 1 1
      rtl/inc/objpash.inc
  2. 2 0
      rtl/win/sysos.inc

+ 1 - 1
rtl/inc/objpash.inc

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

+ 2 - 0
rtl/win/sysos.inc

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