From 4e37beb962d3443dfd03db28a12e4a817850800a Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Fri, 6 Feb 2004 20:47:00 +0000
Subject: [PATCH]   + fpnanosleep for oscdeclh.inc   - removed obsolete darwin
 remarks from bsd/ossysc.inc

---
 rtl/bsd/ossysc.inc    | 14 +++++---------
 rtl/unix/oscdeclh.inc |  8 +++++++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/rtl/bsd/ossysc.inc b/rtl/bsd/ossysc.inc
index 01eea6947f..a68f03f695 100644
--- a/rtl/bsd/ossysc.inc
+++ b/rtl/bsd/ossysc.inc
@@ -526,15 +526,10 @@ end;
 {$user BLA!}
 Function FpNanoSleep(req : ptimespec;rem : ptimespec) : cint; [public, alias : 'FPC_SYSC_NANOSLEEP'];
 begin
-{$ifndef darwin}
   FpNanoSleep:=Do_SysCall(syscall_nr_nanosleep,TSysParam(req),TSysParam(rem));
-{$else not darwin}
-{$warning: TODO: nanosleep!!!}
-{$endif not darwin}
 end;
 
 function Fpgetcwd(pt:pchar; _size:size_t):pchar;[public, alias :'FPC_SYSC_GETCWD'];
-{$ifndef darwin}
 const intpathmax = 1024-4;      // didn't use POSIX data in libc
                                 // implementation.
 var ept,bpt : pchar;
@@ -583,9 +578,6 @@ begin
            End;
  Fpgetcwd:=pt;
 end;
-{$else not darwin}
-{$i getcwd.inc}
-{$endif darwin}
 
 {$endif}
 
@@ -624,7 +616,11 @@ end;
 
 {
  $Log$
- Revision 1.16  2003-12-30 12:26:21  marco
+ Revision 1.17  2004-02-06 20:47:00  jonas
+   + fpnanosleep for oscdeclh.inc
+   - removed obsolete darwin remarks from bsd/ossysc.inc
+
+ Revision 1.16  2003/12/30 12:26:21  marco
   * FPC_USE_LIBC
 
  Revision 1.15  2003/12/16 19:43:59  marco
diff --git a/rtl/unix/oscdeclh.inc b/rtl/unix/oscdeclh.inc
index 68a28f17f8..6b9a33c49a 100644
--- a/rtl/unix/oscdeclh.inc
+++ b/rtl/unix/oscdeclh.inc
@@ -65,6 +65,7 @@ Type TGrpArr = Array [0..0] of TGid;            { C style array workarounds}
     function  FpWrite	(fd: cint;buf:pchar; nbytes : TSize): TSSize; cdecl; external clib name 'write';
     procedure FpExit	(status : cint); cdecl; external clib name '_exit';
     function  fpmmap	(addr:pointer;len:size_t;prot:cint;flags:cint;fd:cint;ofs:off_t):pointer; cdecl; external clib name 'mmap';
+    function  fpmunmap	(addr:pointer;len:size_t):cint; cdecl; external clib name 'munmap';
     function  FpIOCtl   (Handle:cint;Ndx: culong;Data: Pointer):cint; cdecl; external clib name 'ioctl';
     Function  FPSelect  (N:cint;readfds,writefds,exceptfds:pfdSet;TimeOut:PTimeVal):cint; cdecl; external clib name 'select';
     function  fpgetenv  (name : pchar):pchar; cdecl; external clib name 'getenv';
@@ -84,10 +85,15 @@ Type TGrpArr = Array [0..0] of TGid;            { C style array workarounds}
     Function  FpFcntl      (fildes : cInt; cmd : cInt): cInt; cdecl; external clib name 'fcntl';   
     Function  FpFcntl      (fildes : cInt; cmd : cInt; arg :cInt): cInt; cdecl; external clib name 'fcntl';
     Function  FpFcntl      (fildes : cInt; cmd : cInt; var arg : flock): cInt; cdecl external clib name 'fcntl';
+    Function  FPnanosleep  (const rqtp: ptimespec; rmtp: ptimespec): cint; cdecl; external clib name 'nanosleep';
 
 {
    $Log$
-   Revision 1.7  2004-01-12 23:43:22  marco
+   Revision 1.8  2004-02-06 20:47:00  jonas
+     + fpnanosleep for oscdeclh.inc
+     - removed obsolete darwin remarks from bsd/ossysc.inc
+
+   Revision 1.7  2004/01/12 23:43:22  marco
     * some semi colons added
 
    Revision 1.6  2004/01/04 21:05:01  jonas