Răsfoiți Sursa

* some functions are in different libraries under Solaris

git-svn-id: trunk@2475 -
florian 19 ani în urmă
părinte
comite
a7893f3be8
2 a modificat fișierele cu 14 adăugiri și 1 ștergeri
  1. 6 0
      rtl/unix/oscdeclh.inc
  2. 8 1
      rtl/unix/unxdeclh.inc

+ 6 - 0
rtl/unix/oscdeclh.inc

@@ -79,7 +79,13 @@ 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';
+{$ifdef solaris}   
+{$linklib md5} 
+{$linklib aio}
+    Function  FPnanosleep  (const rqtp: ptimespec; rmtp: ptimespec): cint; cdecl; external 'rt' name 'nanosleep';
+{$else solaris}
     Function  FPnanosleep  (const rqtp: ptimespec; rmtp: ptimespec): cint; cdecl; external clib name 'nanosleep';
+{$endif solaris}    
     function  fpNice       (N:cint):cint; cdecl; external clib name 'nice';
     Function  fpGetPriority (Which,Who:cint):cint;      cdecl; external clib name 'getpriority';
     Function  fpSetPriority (Which,Who,What:cint):cint; cdecl; external clib name 'setpriority';

+ 8 - 1
rtl/unix/unxdeclh.inc

@@ -15,8 +15,15 @@
 
 type filedesarray=array[0..1] of cint;
 
-Function fStatFS(Fd:Longint;Var Info:tstatfs):cint; cdecl; external clib name 'fstatfs';
+{$ifdef solaris}
+{ libucb needs libelf }
+{$linklib elf}
+Function fpFlock (fd,mode : longint) : cint; cdecl; external 'ucb' name 'flock';
+{$else solaris}
 Function fpFlock (fd,mode : longint) : cint; cdecl; external clib name 'flock';
+{$endif solaris}
+
+Function fStatFS(Fd:Longint;Var Info:tstatfs):cint; cdecl; external clib name 'fstatfs';
 Function fsync (fd : cint) : cint; cdecl; external clib name 'fsync';
 Function StatFS  (Path:pchar;Var Info:tstatfs):cint; cdecl; external clib name 'statfs';
 function pipe (var fildes: filedesarray):cint;  cdecl; external clib name 'pipe';