Browse Source

* fixed some small problems left from merging. (waitpid has now last param longint)

marco 25 years ago
parent
commit
6e5bd1ad97
3 changed files with 16 additions and 6 deletions
  1. 6 2
      rtl/linux/ipc.pp
  2. 5 2
      rtl/linux/linsysca.inc
  3. 5 2
      rtl/linux/linux.pp

+ 6 - 2
rtl/linux/ipc.pp

@@ -260,8 +260,9 @@ Const
 
 function ipccall(Call,First,Second,Third : Longint; P : Pointer) : longint;
 
+{$ifndef bsd}
 Var SR : SysCallRegs;
-
+{$endif}
 begin
  {$IFNDEF bsd}
   SR.Reg2:=Call;
@@ -371,7 +372,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:48  michael
+  Revision 1.3  2000-09-12 08:51:43  marco
+   * fixed some small problems left from merging. (waitpid has now last param longint)
+
+  Revision 1.2  2000/07/13 11:33:48  michael
   + removed logs
  
 }

+ 5 - 2
rtl/linux/linsysca.inc

@@ -116,7 +116,7 @@ begin
 end;
 
 
-Function WaitPid(Pid:longint;Status:pointer;Options:Integer):Longint;
+Function WaitPid(Pid:longint;Status:pointer;Options:Longint):Longint;
 {
   Waits until a child with PID Pid exits, or returns if it is exited already.
   Any resources used by the child are freed.
@@ -1193,7 +1193,10 @@ end;
 
 {
   $Log$
-  Revision 1.3  2000-09-11 14:05:31  marco
+  Revision 1.4  2000-09-12 08:51:43  marco
+   * fixed some small problems left from merging. (waitpid has now last param longint)
+
+  Revision 1.3  2000/09/11 14:05:31  marco
    * FreeBSD support and removed old signalhandling
 
   Revision 1.2  2000/07/13 11:33:48  michael

+ 5 - 2
rtl/linux/linux.pp

@@ -469,7 +469,7 @@ Function  Fork:longint;
 {Clone for FreeBSD is copied from the LinuxThread port, and rfork based}
 function  Clone(func:TCloneFunc;sp:pointer;flags:longint;args:pointer):longint;
 Procedure ExitProcess(val:longint);
-Function  WaitPid(Pid:longint;Status:pointer;Options:Integer):Longint;
+Function  WaitPid(Pid:longint;Status:pointer;Options:longint):Longint;
 Procedure Nice(N:integer);
 {$ifdef bsd}
 Function  GetPriority(Which,Who:longint):longint;
@@ -2799,7 +2799,10 @@ End.
 
 {
   $Log$
-  Revision 1.6  2000-09-11 14:05:31  marco
+  Revision 1.7  2000-09-12 08:51:43  marco
+   * fixed some small problems left from merging. (waitpid has now last param longint)
+
+  Revision 1.6  2000/09/11 14:05:31  marco
    * FreeBSD support and removed old signalhandling