Explorar o código

Merge commits 41973, 43427 and 45937

------------------------------------------------------------------------
r41973 | pierre | 2019-05-02 12:59:11 +0000 (Thu, 02 May 2019) | 1 line

Add flags field to TStatfs record
------------------------------------------------------------------------
--- Merging r41973 into '.':
U    rtl/linux/ptypes.inc
--- Recording mergeinfo for merge of r41973 into '.':
 U   .
------------------------------------------------------------------------
r43427 | florian | 2019-11-09 18:27:21 +0000 (Sat, 09 Nov 2019) | 1 line

  * TIOCtlRequest is declared as unsigned long according to man 2 ioctl
------------------------------------------------------------------------
--- Merging r43427 into '.':
G    rtl/linux/ptypes.inc
--- Recording mergeinfo for merge of r43427 into '.':
 G   .
------------------------------------------------------------------------
r45837 | pierre | 2020-07-23 21:03:19 +0000 (Thu, 23 Jul 2020) | 1 line

 Define __USE_LARGEFILE64 for sparc-linux, and adapt filed ffree type to that macro
------------------------------------------------------------------------
--- Merging r45837 into '.':
G    rtl/linux/ptypes.inc
--- Recording mergeinfo for merge of r45837 into '.':
 G   .

git-svn-id: branches/fixes_3_2@46284 -
pierre %!s(int64=5) %!d(string=hai) anos
pai
achega
c39c8c1794
Modificáronse 1 ficheiros con 13 adicións e 7 borrados
  1. 13 7
      rtl/linux/ptypes.inc

+ 13 - 7
rtl/linux/ptypes.inc

@@ -29,6 +29,9 @@ and all three 32-bit systems returned completely identical types too
 (everything 32-bit except dev_t, which is assumed to be a result of devfs
 introduction)
 }
+{$ifdef CPUSPARC}
+  {$define __USE_LARGEFILE64}
+{$endif}
 
 {$if defined(CPUMIPS) or defined(cpuaarch64) or defined(cpusparc64)}
 {$define USE_PTHREAD_SIZEOF}
@@ -155,11 +158,7 @@ Type
     TGid     = gid_t;
     pGid     = ^gid_t;
 
-{$ifdef cpusparc64}
     TIOCtlRequest = culong;
-{$else cpusparc64}
-    TIOCtlRequest = cInt;
-{$endif cpusparc64}
 
     socklen_t= cuint32;
     TSockLen = socklen_t;
@@ -195,7 +194,8 @@ Type
     fsid    : array[0..1] of cint;          { File system ID }
     namelen : clong; { Maximum name length in system }
     frsize  : clong;
-    spare   : array [0..4] of clong; { For later use }
+    flags   : clong; 
+    spare   : array [0..3] of clong; { For later use }
   end;
   {$else}
   TStatfs = record
@@ -205,11 +205,17 @@ Type
     bfree,             { free blocks in system }
     bavail,            { Available free blocks to non-root users }
     files,             { File nodes in system }
-    ffree   : culong;  { Free file nodes in system }
+    ffree   : 
+{$ifdef __USE_LARGEFILE64}
+    culonglong;  { Free file nodes in system }
+{$else}
+    culong;  { Free file nodes in system }
+{$endif}
     fsid    : array[0..1] of cint;          { File system ID }
     namelen,           { Maximum name length in system }
     frsize  : cint;
-    spare   : array [0..4] of cint; { For later use }
+    flags   : cint; 
+    spare   : array [0..3] of cint; { For later use }
   end;
   {$endif}
   PStatFS=^TStatFS;