Browse Source

* moved tstatfs from systypes.inc to ptypes.inc to fix make cycle with
-dFPC_USE_LIBC (systypes.inc is now completely commented out)

Jonas Maebe 21 years ago
parent
commit
20fb31f827
2 changed files with 41 additions and 16 deletions
  1. 19 1
      rtl/linux/ptypes.inc
  2. 22 15
      rtl/linux/systypes.inc

+ 19 - 1
rtl/linux/ptypes.inc

@@ -121,6 +121,20 @@ Type
   ptimespec   = ^timespec;
   ptimespec   = ^timespec;
   TTimeSpec   = timespec;
   TTimeSpec   = timespec;
 
 
+  TStatfs = packed record
+    fstype,            { File system type }
+    bsize,             { Optimal block trensfer size }
+    blocks,            { Data blocks in system }
+    bfree,             { free blocks in system }
+    bavail,            { Available free blocks to non-root users }
+    files,             { File nodes in system }
+    ffree,             { Free file nodes in system }
+    fsid,              { File system ID } 
+    namelen : longint; { Maximum name length in system }
+    spare   : array [0..6] of longint; { For later use }
+  end;
+  PStatFS=^TStatFS;
+
 CONST
 CONST
    { System limits, POSIX value in parentheses, used for buffer and stack allocation }
    { System limits, POSIX value in parentheses, used for buffer and stack allocation }
    { took idefix' values}
    { took idefix' values}
@@ -132,7 +146,11 @@ CONST
 
 
 {
 {
    $Log$
    $Log$
-   Revision 1.6  2003-12-30 12:46:40  marco
+   Revision 1.7  2004-01-11 09:56:20  jonas
+     * moved tstatfs from systypes.inc to ptypes.inc to fix make cycle with
+       -dFPC_USE_LIBC (systypes.inc is now completely commented out)
+
+   Revision 1.6  2003/12/30 12:46:40  marco
     * ptime_t
     * ptime_t
 
 
    Revision 1.5  2003/09/27 13:45:58  peter
    Revision 1.5  2003/09/27 13:45:58  peter

+ 22 - 15
rtl/linux/systypes.inc

@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
  **********************************************************************}
  **********************************************************************}
-type
+{type}
 
 
 {
 {
  Linux system calls take arguments as follows :
  Linux system calls take arguments as follows :
@@ -35,6 +35,22 @@ type
   PSysCallRegs=^SysCallRegs;
   PSysCallRegs=^SysCallRegs;
   TSysCallRegs=SysCallRegs;
   TSysCallRegs=SysCallRegs;
 }
 }
+
+{
+  TStatfs = packed record
+    fstype,            { File system type }
+    bsize,             { Optimal block trensfer size }
+    blocks,            { Data blocks in system }
+    bfree,             { free blocks in system }
+    bavail,            { Available free blocks to non-root users }
+    files,             { File nodes in system }
+    ffree,             { Free file nodes in system }
+    fsid,              { File system ID }
+    namelen : longint; { Maximum name length in system }
+    spare   : array [0..6] of longint; { For later use }
+  end;
+  PStatFS=^TStatFS;
+}
 {
 {
 { The following are records for system calls }
 { The following are records for system calls }
   dirent = packed record
   dirent = packed record
@@ -86,19 +102,6 @@ type
   PStat=^Stat;
   PStat=^Stat;
   TStat=Stat;
   TStat=Stat;
 }
 }
-  TStatfs = packed record
-    fstype,            { File system type }
-    bsize,             { Optimal block trensfer size }
-    blocks,            { Data blocks in system }
-    bfree,             { free blocks in system }
-    bavail,            { Available free blocks to non-root users }
-    files,             { File nodes in system }
-    ffree,             { Free file nodes in system }
-    fsid,              { File system ID }
-    namelen : longint; { Maximum name length in system }
-    spare   : array [0..6] of longint; { For later use }
-  end;
-  PStatFS=^TStatFS;
 
 
 {
 {
 
 
@@ -138,7 +141,11 @@ type
 }
 }
 {
 {
   $Log$
   $Log$
-  Revision 1.12  2003-09-14 20:15:01  marco
+  Revision 1.13  2004-01-11 09:56:20  jonas
+    * moved tstatfs from systypes.inc to ptypes.inc to fix make cycle with
+      -dFPC_USE_LIBC (systypes.inc is now completely commented out)
+
+  Revision 1.12  2003/09/14 20:15:01  marco
    * Unix reform stage two. Remove all calls from Unix that exist in Baseunix.
    * Unix reform stage two. Remove all calls from Unix that exist in Baseunix.
 
 
   Revision 1.11  2003/08/21 22:24:52  olle
   Revision 1.11  2003/08/21 22:24:52  olle