From 9b33a79bea19bd2c5973497bd4c11a9dc3f3f7f9 Mon Sep 17 00:00:00 2001
From: marco <marco@freepascal.org>
Date: Mon, 15 Sep 2003 21:07:32 +0000
Subject: [PATCH]  * second round of linux fixes. oldlinux now works

---
 rtl/linux/unixsysc.inc |  8 ++++++--
 rtl/unix/linuxold.inc  | 23 ++++++++---------------
 rtl/unix/liunsysc.inc  | 11 +++++++----
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/rtl/linux/unixsysc.inc b/rtl/linux/unixsysc.inc
index c3a3768902..04fb301886 100644
--- a/rtl/linux/unixsysc.inc
+++ b/rtl/linux/unixsysc.inc
@@ -571,7 +571,8 @@ begin
   Dup2:=(LinuxError=0);
 end;
 
-Function AssignPipe(var pipe_in,pipe_out:longint):boolean;
+Function AssignPipe(var pipe_in,pipe_out:longint):boolean; [public, alias : 'FPC_SYSC_ASSIGNPIPE'];
+
 {
   Sets up a pair of file variables, which act as a pipe. The first one can
   be read from, the second one can be written to.
@@ -860,7 +861,10 @@ end;
 
 {
   $Log$
-  Revision 1.10  2003-09-14 20:15:01  marco
+  Revision 1.11  2003-09-15 21:07:32  marco
+   * second round of linux fixes. oldlinux now works
+
+  Revision 1.10  2003/09/14 20:15:01  marco
    * Unix reform stage two. Remove all calls from Unix that exist in Baseunix.
 
   Revision 1.9  2003/07/08 21:23:24  peter
diff --git a/rtl/unix/linuxold.inc b/rtl/unix/linuxold.inc
index 670c36daea..37e80b244a 100644
--- a/rtl/unix/linuxold.inc
+++ b/rtl/unix/linuxold.inc
@@ -224,13 +224,8 @@ Procedure ExitProcess(val:longint);
 Function  WaitPid(Pid:longint;Status:pointer;Options:Longint):Longint;  {=>PID (Status Valid), 0 (No Status), -1: Error, special case errno=EINTR }
 Function  WaitProcess(Pid:longint):Longint; { like WaitPid(PID,@result,0) Handling of Signal interrupts (errno=EINTR), returning the Exitcode of Process (>=0) or -Status if terminated}
 Procedure Nice(N:integer);
-{$ifdef bsd}
 Function  GetPriority(Which,Who:longint):longint;
 procedure SetPriority(Which,Who,What:longint);
-{$else}
-Function  GetPriority(Which,Who:Integer):integer;
-Procedure SetPriority(Which:Integer;Who:Integer;What:Integer);
-{$endif}
 
 Function  GetPid:LongInt;
 Function  GetPPid:LongInt;
@@ -277,11 +272,7 @@ Function  FReName (OldName,NewName : String) : Boolean;
 Function  Chown(path:pathstr;NewUid,NewGid:longint):boolean;
 Function  Chmod(path:pathstr;Newmode:longint):boolean;
 Function  Utime(path:pathstr;utim:utimebuf):boolean;
-{$ifdef BSD}
 Function  Access(Path:Pathstr ;mode:longint):boolean;
-{$else}
-Function  Access(Path:Pathstr ;mode:integer):boolean;
-{$endif}
 Function  Umask(Mask:Integer):integer;
 Function  Flock (fd,mode : longint) : boolean;
 Function  Flock (var T : text;mode : longint) : boolean;
@@ -417,7 +408,7 @@ type
     offset  : longint;
   end;
 
-function MMap(const m:tmmapargs):longint;
+function MMap(const m:tmmapargs):pointer;
 function MUnMap (P : Pointer; Size : Longint) : Boolean;
 
 {**************************
@@ -425,9 +416,7 @@ function MUnMap (P : Pointer; Size : Longint) : Boolean;
 ***************************}
 
 //Function  IOperm (From,Num : Cardinal; Value : Longint) : boolean;
-{$ifndef BSD}
-Function  IoPL(Level : longint) : Boolean;
-{$endif}
+//Function  IoPL(Level : longint) : Boolean;
 {$ifdef i386}
 Procedure WritePort (Port : Longint; Value : Byte);
 Procedure WritePort (Port : Longint; Value : Word);
@@ -504,8 +493,9 @@ Uses Strings;
 
 {$i liunsysc.inc}   {Syscalls only used in unit Unix/Linux}
 
+{$ifndef Linux}
 Function FpNanoSleep(const req : timespec;rem : ptimespec) : longint; external name 'FPC_SYSC_NANOSLEEP';
-
+{$endif}
 
 {******************************************************************************
                           Process related calls
@@ -3130,7 +3120,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.2  2003-09-15 20:08:49  marco
+  Revision 1.3  2003-09-15 21:07:41  marco
+   * second round of linux fixes. oldlinux now works
+
+  Revision 1.2  2003/09/15 20:08:49  marco
    * small fixes. FreeBSD now cycles
 
   Revision 1.1  2003/09/15 14:12:17  marco
diff --git a/rtl/unix/liunsysc.inc b/rtl/unix/liunsysc.inc
index e1107ff78b..e382ef4996 100644
--- a/rtl/unix/liunsysc.inc
+++ b/rtl/unix/liunsysc.inc
@@ -589,16 +589,16 @@ begin
   LinuxError:=fpgetErrno;
 end;
 
-function MMap(const m:tmmapargs):longint;
+function MMap(const m:tmmapargs):pointer;
 begin
-  mmap:=fpmmap(m.address,m.size,m.prot, m.flags,m.fd, m.offset);
+  mmap:=fpmmap(pointer(m.address),m.size,m.prot, m.flags,m.fd, m.offset);
   LinuxError:=fpgetErrno;
 end;
 
 function MUnMap (P : Pointer; Size : Longint) : Boolean;
 
 begin
-  MUnMap:=fpmunmap(longint(p),size)=0;
+  MUnMap:=fpmunmap(p,size)=0;
   LinuxError:=fpgetErrno;
 end;
 
@@ -636,7 +636,10 @@ end;
 
 {
   $Log$
-  Revision 1.1  2003-09-15 20:30:49  marco
+  Revision 1.2  2003-09-15 21:07:41  marco
+   * second round of linux fixes. oldlinux now works
+
+  Revision 1.1  2003/09/15 20:30:49  marco
    * syscalls
 
   Revision 1.10  2003/09/14 20:15:01  marco