* small changes originating from introduction of Baseunix to FreeBSD

rtl/unix/bunxh.inc

@@ -24,10 +24,8 @@ Type TGrpArr = Array [0..0] of TGid;		{ C style array workarounds}
     Function  FpSigAddSet  (var nset : TSigSet; signo : cInt): cInt;
     Function  FpSigDelSet  (var nset : TSigSet; signo : cInt): cInt;
     Function  FpSigIsMember(Const nset : TSigSet; signo : cInt): cInt;
-    Function  FpSigProcMask(how : cInt; nset : pSigSet; oset : pSigSet): cInt;
-   {$ifndef ver1_0}
-    Function  FpSigProcMask(how : cInt; Const nset : TSigSet; var oset : TSigSet): cInt;external name 'FPC_SYSC_SIGPROGMASK';
-   {$endif}
+    Function  FpSigProcMask(how : cInt; nset : pSigSet; oset : pSigSet): cInt; 
+    Function  FpSigProcMask(how : cInt; Const nset : TSigSet; var oset : TSigSet): cInt; 
     Function  FpSigPending (var nset : TSigSet): cInt;
     Function  FpSigSuspend (Const sigmask : TSigSet): cInt;
 
@@ -108,7 +106,10 @@ Type TGrpArr = Array [0..0] of TGid;		{ C style array workarounds}
 
 {
   $Log$
-  Revision 1.1  2002-12-18 16:49:02  marco
+  Revision 1.2  2003-01-05 19:11:32  marco
+   * small changes originating from introduction of Baseunix to FreeBSD
+
+  Revision 1.1  2002/12/18 16:49:02  marco
    * New RTL. Linux system unit and baseunix operational.
 
 

rtl/unix/linux.pp

@@ -1090,7 +1090,7 @@ Function Fcntl(Fd:longint;Cmd:longint):longint;
 begin
   if (cmd in [F_GetFd,F_GetFl,F_GetOwn]) then
    begin
-     Linuxerror:=fdfcntl(fd,cmd,0);
+     Linuxerror:=fpfcntl(fd,cmd,0);
      if linuxerror=-1 then
       begin
         linuxerror:=errno;
@@ -3032,7 +3032,10 @@ End.
 
 {
   $Log$
-  Revision 1.26  2002-12-18 17:52:07  peter
+  Revision 1.27  2003-01-05 19:11:32  marco
+   * small changes originating from introduction of Baseunix to FreeBSD
+
+  Revision 1.26  2002/12/18 17:52:07  peter
     * replaced some Fp with Sys_ to get cycle working
 
   Revision 1.25  2002/12/18 16:50:39  marco

rtl/unix/systhrds.pp

@@ -117,7 +117,7 @@ var
 { Include syscall itself }
 {$i syscallo.inc}
 
-Function Sys_mmap(adr,len,prot,flags,fdes,off:longint):longint;
+Function Fpmmap(adr,len,prot,flags,fdes,off:longint):longint;
 type
   tmmapargs=packed record
     address : longint;
@@ -138,16 +138,16 @@ begin
   mmapargs.fd:=fdes;
   mmapargs.offset:=off;
   t.reg2:=longint(@mmapargs);
-  Sys_mmap:=syscall(syscall_nr_mmap,t);
+  Fpmmap:=syscall(syscall_nr_mmap,t);
 end;
 
-Function Sys_munmap(adr,len:longint):longint;
+Function Fpmunmap(adr,len:longint):longint;
 var
   t : syscallregs;
 begin
   t.reg2:=adr;
   t.reg3:=len;
-  Sys_munmap:=syscall(syscall_nr_munmap,t);
+  Fpmunmap:=syscall(syscall_nr_munmap,t);
 end;
 
 {$else}
@@ -157,9 +157,9 @@ CONST
   MAP_ANONYMOUS =$1000;
 
   // include some non posix internal types.
-  {$i bsdtypes.inc}
+  {$i ostypes.inc}
   // *BSD POSIX. Include headers to syscalls.
-  {$I bsdsysch.inc}
+  {$I ossysch.inc}
 
 {$endif}
 
@@ -195,7 +195,7 @@ CONST
         { exceptions which use threadvars but       }
         { these aren't allocated yet ...            }
         { allocate room on the heap for the thread vars }
-        DataIndex:=Pointer(Sys_mmap(0,threadvarblocksize,3,MAP_PRIVATE+MAP_ANONYMOUS,-1,0));
+        DataIndex:=Pointer(Fpmmap(0,threadvarblocksize,3,MAP_PRIVATE+MAP_ANONYMOUS,-1,0));
         FillChar(DataIndex^,threadvarblocksize,0);
         pthread_setspecific(tlskey,dataindex);
       end;
@@ -203,7 +203,7 @@ CONST
 
     procedure SysReleaseThreadVars;
       begin
-        Sys_munmap(longint(pthread_getspecific(tlskey)),threadvarblocksize);
+        Fpmunmap(longint(pthread_getspecific(tlskey)),threadvarblocksize);
       end;
 
 { Include OS independent Threadvar initialization }
@@ -382,7 +382,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.6  2002-11-11 21:41:06  marco
+  Revision 1.7  2003-01-05 19:11:32  marco
+   * small changes originating from introduction of Baseunix to FreeBSD
+
+  Revision 1.6  2002/11/11 21:41:06  marco
    * syscall.inc -> syscallo.inc
 
   Revision 1.5  2002/10/31 13:45:21  carl