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

* fixed several type declarations

git-svn-id: trunk@7071 -
florian преди 18 години
родител
ревизия
d90bc77a54
променени са 2 файла, в които са добавени 15 реда и са изтрити 8 реда
  1. 13 6
      rtl/linux/ptypes.inc
  2. 2 2
      rtl/unix/ipc.pp

+ 13 - 6
rtl/linux/ptypes.inc

@@ -47,10 +47,6 @@ Type
     TkDev    = KDev_t;          // kernel and glibc. This is kernel.
     pkDev    = ^kdev_t;
 
-    gid_t    = cuint32;         { used for group IDs           }
-    TGid     = gid_t;
-    pGid     = ^gid_t;
-
     ino_t    = clong;           { used for file serial numbers }
     TIno     = ino_t;
     pIno     = ^ino_t;
@@ -79,7 +75,7 @@ Type
     TOff     = off_t;
     pOff     = ^off_t;
 
-    pid_t    = cint32;          { used as process identifier   }
+    pid_t    = cint;          { used as process identifier   }
     TPid     = pid_t;
     pPid     = ^pid_t;
 
@@ -109,9 +105,20 @@ Type
     wchar_t   = widechar;
     pwchar_t  = ^wchar_t;
 
-    uid_t    = cuint32;         { used for user ID type        }
+{$ifdef cpu64}
+    uid_t    = cuint;         { used for user ID type        }
+    gid_t    = cuint;         { used for group IDs           }
+    ipc_pid_t = cint;
+{$else cpu64}
+    uid_t    = cushort;         { used for user ID type        }
+    gid_t    = cushort;         { used for group IDs           }
+    ipc_pid_t = cushort;
+{$endif cpu64}
     TUid     = uid_t;
     pUid     = ^uid_t;
+    TGid     = gid_t;
+    pGid     = ^gid_t;
+
 
     socklen_t= cuint32;
     TSockLen = socklen_t;

+ 2 - 2
rtl/unix/ipc.pp

@@ -252,8 +252,8 @@ type
     msg_cbytes : word;
     msg_qnum   : word;
     msg_qbytes : word;
-    msg_lspid  : pid_t;
-    msg_lrpid  : pid_t;
+    msg_lspid  : ipc_pid_t;
+    msg_lrpid  : ipc_pid_t;
   end;
 {$else}
   PMSQid_ds = ^TMSQid_ds;