Browse Source

Merged revisions 7264,7267-7268 via svnmerge from
svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r7264 | marco | 2007-05-04 21:16:11 +0200 (Fri, 04 May 2007) | 2 lines

* bug #8807, PRIO_ constants not aliased to baseunix _merge_

........
r7267 | marco | 2007-05-05 00:06:12 +0200 (Sat, 05 May 2007) | 1 line

* removed restoration ofa compability that never existed
........
r7268 | marco | 2007-05-05 00:09:02 +0200 (Sat, 05 May 2007) | 1 line

* removed restoration ofa compability that never existed
........

git-svn-id: branches/fixes_2_2@7277 -

joost 18 years ago
parent
commit
0c3e044812
3 changed files with 47 additions and 98 deletions
  1. 22 53
      rtl/bsd/ostypes.inc
  2. 21 45
      rtl/solaris/ostypes.inc
  3. 4 0
      rtl/unix/aliasptp.inc

+ 22 - 53
rtl/bsd/ostypes.inc

@@ -59,65 +59,34 @@ TYPE
 
   { file characteristics services }
    stat    = record { the types are real}
-     case byte of
-       0:
-         (dev        : dev_t;            // inode's device
-         ino        : ino_t;             // inode's number
-         mode       : mode_t;            // inode protection mode
-         nlink      : nlink_t;           // number of hard links
-         uid        : uid_t;             // user ID of the file's owner
-         gid        : gid_t;             // group ID of the file's group
-         rdev       : dev_t;             // device type
-         atime      : time_t;            // time of last access
-         atimensec  : clong;             // nsec of last access
-         mtime      : time_t;            // time of last data modification
-         mtimensec  : clong;             // nsec of last data modification
-         ctime      : time_t;            // time of last file status change
-         ctimensec  : clong;             // nsec of last file status change
+        st_dev        : dev_t;             // inode's device
+        st_ino        : ino_t;             // inode's number
+        st_mode       : mode_t;            // inode protection mode
+        st_nlink      : nlink_t;           // number of hard links
+        st_uid        : uid_t;             // user ID of the file's owner
+        st_gid        : gid_t;             // group ID of the file's group
+        st_rdev       : dev_t;             // device type
+        st_atime      : time_t;            // time of last access
+        st_atimensec  : clong;             // nsec of last access
+        st_mtime      : time_t;            // time of last data modification
+        st_mtimensec  : clong;             // nsec of last data modification
+        st_ctime      : time_t;            // time of last file status change
+        st_ctimensec  : clong;             // nsec of last file status change
 {$ifdef netbsdPowerpc}
-         padd1              : cint;
+        st_padd1              : cint;
 {$endif}
-         size       : off_t;             // file size, in bytes
-         blocks     : cint64;            // blocks allocated for file
-         blksize    : cuint32;           // optimal blocksize for I/O
-         flags      : cuint32;           // user defined flags for file
-         gen        : cuint32;           // file generation number
+        st_size       : off_t;             // file size, in bytes
+        st_blocks     : cint64;            // blocks allocated for file
+        st_blksize    : cuint32;           // optimal blocksize for I/O
+        st_flags      : cuint32;           // user defined flags for file
+        st_gen        : cuint32;           // file generation number
 {$ifdef netbsdPowerpc}
-         padd2              : cint;
+        st_padd2              : cint;
 {$endif}
 {$ifndef NetBSD}
-         lspare     : cint32;
+        st_lspare     : cint32;
 {$endif}
-         qspare     : array[0..1] Of cint64;);
-       1:
-         (st_dev        : dev_t;            // inode's device
-         st_ino        : ino_t;             // inode's number
-         st_mode       : mode_t;            // inode protection mode
-         st_nlink      : nlink_t;           // number of hard links
-         st_uid        : uid_t;             // user ID of the file's owner
-         st_gid        : gid_t;             // group ID of the file's group
-         st_rdev       : dev_t;             // device type
-         st_atime      : time_t;            // time of last access
-         st_atimensec  : clong;             // nsec of last access
-         st_mtime      : time_t;            // time of last data modification
-         st_mtimensec  : clong;             // nsec of last data modification
-         st_ctime      : time_t;            // time of last file status change
-         st_ctimensec  : clong;             // nsec of last file status change
-{$ifdef netbsdPowerpc}
-         st_padd1              : cint;
-{$endif}
-         st_size       : off_t;             // file size, in bytes
-         st_blocks     : cint64;            // blocks allocated for file
-         st_blksize    : cuint32;           // optimal blocksize for I/O
-         st_flags      : cuint32;           // user defined flags for file
-         st_gen        : cuint32;           // file generation number
-{$ifdef netbsdPowerpc}
-         st_padd2              : cint;
-{$endif}
-{$ifndef NetBSD}
-         st_lspare     : cint32;
-{$endif}
-         st_qspare     : array[0..1] Of cint64;);
+        st_qspare     : array[0..1] Of cint64;
    end;
    TStat = stat;
    pStat = ^stat;

+ 21 - 45
rtl/solaris/ostypes.inc

@@ -40,51 +40,27 @@ TYPE
 
    { file characteristics services }
    stat = packed record { verify the alignment of the members }
-     case byte of
-       0:
-         (dev : dev_t;
-         pad1 : array[1..3] of longint;  { reserve for dev expansion }
-         ino : ino_t;
-         mode : mode_t;
-         nlink : nlink_t;
-         uid : uid_t;
-         gid : gid_t;
-         rdev : dev_t;
-         pad2 : array[1..2] of longint;
-         size : off_t;
-         pad3 : longint;   {* reserve pad for future off_t expansion *}
-         atime : time_t;
-         atimens : longint;    { access time nanosecond field         }
-         mtime : time_t;
-         mtimens : longint;    { modification time nanosecond field   }
-         ctime : time_t;
-         ctimens : longint;    { modification time nanosecond field   }
-         blksize : blksize_t;
-         blocks : blkcnt_t;
-         fstype : array[0..ST_FSTYPSZ-1] of char;
-         pad4 : array[1..8] of longint);
-       1:
-         (st_dev : dev_t;
-         st_pad1 : array[1..3] of longint;  { reserve for dev expansion }
-         st_ino : ino_t;
-         st_mode : mode_t;
-         st_nlink : nlink_t;
-         st_uid : uid_t;
-         st_gid : gid_t;
-         st_rdev : dev_t;
-         st_pad2 : array[1..2] of longint;
-         st_size : off_t;
-         st_pad3 : longint;   {* reserve pad for future off_t expansion *}
-         st_atime : time_t;
-         st_atimens : longint;    { access time nanosecond field         }
-         st_mtime : time_t;
-         st_mtimens : longint;    { modification time nanosecond field   }
-         st_ctime : time_t;
-         st_ctimens : longint;    { modification time nanosecond field   }
-         st_blksize : blksize_t;
-         st_blocks : blkcnt_t;
-         st_fstype : array[0..ST_FSTYPSZ-1] of char;
-         st_pad4 : array[1..8] of longint);
+     st_dev : dev_t;
+     st_pad1 : array[1..3] of longint;  { reserve for dev expansion }
+     st_ino : ino_t;
+     st_mode : mode_t;
+     st_nlink : nlink_t;
+     st_uid : uid_t;
+     st_gid : gid_t;
+     st_rdev : dev_t;
+     st_pad2 : array[1..2] of longint;
+     st_size : off_t;
+     st_pad3 : longint;   {* reserve pad for future off_t expansion *}
+     st_atime : time_t;
+     st_atimens : longint;    { access time nanosecond field         }
+     st_mtime : time_t;
+     st_mtimens : longint;    { modification time nanosecond field   }
+     st_ctime : time_t;
+     st_ctimens : longint;    { modification time nanosecond field   }
+     st_blksize : blksize_t;
+     st_blocks : blkcnt_t;
+     st_fstype : array[0..ST_FSTYPSZ-1] of char;
+     st_pad4 : array[1..8] of longint;
    end;
    TStat             = Stat;
    PStat             = ^Stat;

+ 4 - 0
rtl/unix/aliasptp.inc

@@ -81,3 +81,7 @@ CONST
     SIG_MAXSIG    = UnixType.SIG_MAXSIG;
 //   wordsinsigset = UnixType.wordsinsigset;
 
+    PRIO_PROCESS  = UnixType.PRIO_PROCESS;
+    PRIO_PGRP	  = UnixType.PRIO_PGRP;
+    PRIO_USER	  = UnixType.PRIO_USER;
+