Преглед на файлове

* fix for TAbstractSearchRec.Time type change

git-svn-id: trunk@44113 -
Tomas Hajny преди 5 години
родител
ревизия
9ce1d0e509
променени са 2 файла, в които са добавени 7 реда и са изтрити 15 реда
  1. 4 7
      rtl/emx/sysutils.pp
  2. 3 8
      rtl/os2/sysutils.pp

+ 4 - 7
rtl/emx/sysutils.pp

@@ -684,9 +684,6 @@ end;
 
 
 
 
 type
 type
-  TRec = record
-   T, D: word;
-  end;
   PSearchRec = ^SearchRec;
   PSearchRec = ^SearchRec;
 
 
 Function InternalFindFirst (Const Path : RawByteString; Attr : Longint; out Rslt : TAbstractSearchRec; var Name: RawByteString) : Longint;
 Function InternalFindFirst (Const Path : RawByteString; Attr : Longint; out Rslt : TAbstractSearchRec; var Name: RawByteString) : Longint;
@@ -717,8 +714,8 @@ begin
     if Err = 0 then
     if Err = 0 then
      begin
      begin
       Rslt.ExcludeAttr := 0;
       Rslt.ExcludeAttr := 0;
-      TRec (Rslt.Time).T := FStat^.TimeLastWrite;
-      TRec (Rslt.Time).D := FStat^.DateLastWrite;
+      Rslt.Time := cardinal (FStat^.DateLastWrite) shl 16 +
+                                                          FStat^.TimeLastWrite;
       if FSApi64 then
       if FSApi64 then
        begin
        begin
         Rslt.Size := FStat^.FileSize;
         Rslt.Size := FStat^.FileSize;
@@ -779,8 +776,8 @@ begin
     if Err = 0 then
     if Err = 0 then
      begin
      begin
       Rslt.ExcludeAttr := 0;
       Rslt.ExcludeAttr := 0;
-      TRec (Rslt.Time).T := FStat^.TimeLastWrite;
-      TRec (Rslt.Time).D := FStat^.DateLastWrite;
+      Rslt.Time := cardinal (FStat^.DateLastWrite) shl 16 +
+                                                          FStat^.TimeLastWrite;
       if FSApi64 then
       if FSApi64 then
        begin
        begin
         Rslt.Size := FStat^.FileSize;
         Rslt.Size := FStat^.FileSize;

+ 3 - 8
rtl/os2/sysutils.pp

@@ -250,10 +250,7 @@ begin
 end;
 end;
 
 
 
 
-type    TRec = record
-            T, D: word;
-        end;
-        PSearchRec = ^TSearchRec;
+type    PSearchRec = ^TSearchRec;
 
 
 Function InternalFindFirst (Const Path : RawByteString; Attr : Longint; out Rslt : TAbstractSearchRec; var Name: RawByteString) : Longint;
 Function InternalFindFirst (Const Path : RawByteString; Attr : Longint; out Rslt : TAbstractSearchRec; var Name: RawByteString) : Longint;
 
 
@@ -283,8 +280,7 @@ begin
   if Err = 0 then
   if Err = 0 then
    begin
    begin
     Rslt.ExcludeAttr := 0;
     Rslt.ExcludeAttr := 0;
-    TRec (Rslt.Time).T := FStat^.TimeLastWrite;
-    TRec (Rslt.Time).D := FStat^.DateLastWrite;
+    Rslt.Time := cardinal (FStat^.DateLastWrite) shl 16 + FStat^.TimeLastWrite;
     if FSApi64 then
     if FSApi64 then
      begin
      begin
       Rslt.Size := FStat^.FileSize;
       Rslt.Size := FStat^.FileSize;
@@ -324,8 +320,7 @@ begin
   if Err = 0 then
   if Err = 0 then
   begin
   begin
     Rslt.ExcludeAttr := 0;
     Rslt.ExcludeAttr := 0;
-    TRec (Rslt.Time).T := FStat^.TimeLastWrite;
-    TRec (Rslt.Time).D := FStat^.DateLastWrite;
+    Rslt.Time := cardinal (FStat^.DateLastWrite) shl 16 + FStat^.TimeLastWrite;
     if FSApi64 then
     if FSApi64 then
      begin
      begin
       Rslt.Size := FStat^.FileSize;
       Rslt.Size := FStat^.FileSize;