Browse Source

* Fix for i386 breakage after merge request !433

Michaël Van Canneyt 2 years ago
parent
commit
a3a827eba5
3 changed files with 11 additions and 11 deletions
  1. 1 1
      rtl/linux/loongarch64/cp_new_stat.inc
  2. 2 2
      rtl/linux/ossysc.inc
  3. 8 8
      rtl/linux/ostypes.inc

+ 1 - 1
rtl/linux/loongarch64/cp_new_stat.inc

@@ -14,7 +14,7 @@
 
  **********************************************************************}
 
-  procedure cp_new_stat(nbuf: pstatx; buf: pstat);
+  procedure cp_new_stat(nbuf: pstatx64; buf: pstat);
 
   begin
     buf^.st_dev:=makedev(nbuf^.stx_dev_major,nbuf^.stx_dev_minor);

+ 2 - 2
rtl/linux/ossysc.inc

@@ -122,7 +122,7 @@ end;
 function Fpstat(path: pchar; var buf: stat):cint; [public, alias : 'FPC_SYSC_STAT'];
 
 var
-  nbuf:tstatx;
+  nbuf:tstatx64;
 
 begin
   Fpstat:=do_syscall(syscall_nr_statx,AT_FDCWD,TSysParam(path),AT_NO_AUTOMOUNT,STATX_BASIC_STATS,TSysParam(@nbuf));
@@ -430,7 +430,7 @@ end;
 function Fpfstat(fd : cint; var sb : stat): cint;  [public, alias : 'FPC_SYSC_FSTAT'];
 
 var
-  nbuf:tstatx;
+  nbuf:tstatx64;
   nonestr:char=#0;
 
 begin

+ 8 - 8
rtl/linux/ostypes.inc

@@ -102,14 +102,14 @@ type
   PStat      = ^Stat;
 
   { Referred to rtl/linux/linux.pp }
-  statx_timestamp = record
+  statx64_timestamp = record
     tv_sec : cint64;
     tv_nsec : cuint32;
     __reserved : cint32;
   end;
-  pstatx_timestamp = ^statx_timestamp;
+  pstatx64_timestamp = ^statx64_timestamp;
 
-  tstatx = record
+  tstatx64 = record
     stx_mask : cuint32;
     stx_blksize : cuint32;
     stx_attributes : cuint64;
@@ -122,17 +122,17 @@ type
     stx_size : cuint64;
     stx_blocks : cuint64;
     stx_attributes_mask : cuint64;
-    stx_atime : statx_timestamp;
-    stx_btime : statx_timestamp;
-    stx_ctime : statx_timestamp;
-    stx_mtime : statx_timestamp;
+    stx_atime : statx64_timestamp;
+    stx_btime : statx64_timestamp;
+    stx_ctime : statx64_timestamp;
+    stx_mtime : statx64_timestamp;
     stx_rdev_major : cuint32;
     stx_rdev_minor : cuint32;
     stx_dev_major : cuint32;
     stx_dev_minor : cuint32;
     __spare2 : array[0..13] of cuint64;
   end;
-  pstatx = ^tstatx;
+  pstatx64 = ^tstatx64;
 
   { directory services }
   { the Dirent type for getdents64 is no longer declared as ending with