* flock -> fpflock because of conflicting structure name

rtl/freebsd/unixsysc.inc

@@ -69,10 +69,10 @@ begin
   fsync:=do_syscall(syscall_nr_fsync,fd);
 end;
 
-Function  Flock (fd,mode : longint) : cint;
+Function  fpFlock (fd,mode : longint) : cint;
 
 begin
- Flock:=do_syscall(syscall_nr_flock,fd,mode);
+ fpFlock:=do_syscall(syscall_nr_flock,fd,mode);
 end;
 
 Function fStatFS(Fd:Longint;Var Info:tstatfs):cint;
@@ -278,7 +278,10 @@ end;
 
 {
   $Log$
-  Revision 1.19  2004-03-04 22:15:16  marco
+  Revision 1.20  2004-04-23 19:16:24  marco
+   * flock -> fpflock because of conflicting structure name
+
+  Revision 1.19  2004/03/04 22:15:16  marco
    * UnixType changes. Please report problems to me.
 
   Revision 1.18  2004/01/01 17:07:21  marco

rtl/linux/unixsysc.inc

@@ -19,9 +19,9 @@ begin
   fsync := do_SysCall(syscall_nr_fsync, fd);
 end;
 
-Function  Flock (fd,mode : cint) : cint;
+Function  fpFlock (fd,mode : cint) : cint;
 begin
-  flock:=do_Syscall(Syscall_nr_flock,fd,mode);
+  fpflock:=do_Syscall(Syscall_nr_flock,fd,mode);
 end;
 
 
@@ -117,7 +117,10 @@ end;
 
 {
   $Log$
-  Revision 1.25  2004-01-02 22:46:29  marco
+  Revision 1.26  2004-04-23 19:16:24  marco
+   * flock -> fpflock because of conflicting structure name
+
+  Revision 1.25  2004/01/02 22:46:29  marco
    * fix from Marc W.
 
   Revision 1.24  2003/12/31 20:23:31  marco

rtl/unix/unix.pp

@@ -140,13 +140,13 @@ Function W_STOPCODE (Signal: Integer): Integer;
 
 {$ifndef FPC_USE_LIBC} // defined using cdecl for libc.
 Function  fsync (fd : cint) : cint;
-Function  Flock   (fd,mode : cint)   : cint ;
+Function  fpFlock   (fd,mode : cint)   : cint ;
 Function  fStatFS (Fd: cint;Var Info:tstatfs):cint;
 Function  StatFS  (Path:pchar;Var Info:tstatfs):cint; 
 {$endif}
 
-Function  Flock   (var T : text;mode : cint) : cint;
-Function  Flock   (var F : File;mode : cint) : cint;
+Function  fpFlock   (var T : text;mode : cint) : cint;
+Function  fpFlock   (var F : File;mode : cint) : cint;
 
 
 Function  SelectText (var T:Text;TimeOut :PTimeVal):cint;
@@ -949,15 +949,15 @@ begin
   Execl:=ExecLE(ToDo,EnvP);
 end;
 
-Function Flock (var T : text;mode : cint) : cint;
+Function fpFlock (var T : text;mode : cint) : cint;
 begin
-  Flock:=Flock(TextRec(T).Handle,mode);
+  fpFlock:=fpFlock(TextRec(T).Handle,mode);
 end;
 
 
-Function  Flock (var F : File;mode : cint) :cint;
+Function  fpFlock (var F : File;mode : cint) :cint;
 begin
-  Flock:=Flock(FileRec(F).Handle,mode);
+  fpFlock:=fpFlock(FileRec(F).Handle,mode);
 end;
 
 Function SelectText(var T:Text;TimeOut :PTimeval):cint;
@@ -1754,7 +1754,10 @@ End.
 
 {
   $Log$
-  Revision 1.69  2004-04-22 17:17:13  peter
+  Revision 1.70  2004-04-23 19:16:25  marco
+   * flock -> fpflock because of conflicting structure name
+
+  Revision 1.69  2004/04/22 17:17:13  peter
     * x86-64 fixes
 
   Revision 1.68  2004/03/04 22:15:17  marco

rtl/unix/unxdeclh.inc

@@ -18,7 +18,7 @@ type filedesarray=array[0..1] of cint;
 
 function fpMUnMap (P : Pointer; Size : size_t) : cint; cdecl; external clib name 'munmap';
 Function fStatFS(Fd:Longint;Var Info:tstatfs):cint; cdecl; external clib name 'fstatfs';
-Function Flock (fd,mode : longint) : cint; cdecl; external clib name 'flock';
+Function fpFlock (fd,mode : longint) : cint; cdecl; external clib name 'flock';
 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';
@@ -32,7 +32,10 @@ function fpgettimeofday(tp: ptimeval;tzp:ptimezone):cint;   cdecl; external clib
 
 {
    $Log$
-   Revision 1.3  2004-01-04 21:05:01  jonas
+   Revision 1.4  2004-04-23 19:16:25  marco
+    * flock -> fpflock because of conflicting structure name
+
+   Revision 1.3  2004/01/04 21:05:01  jonas
      * declare C-library routines as external in libc so we generate proper
        import entries for Darwin