+ Solved some more naming conflicts

packages/base/libc/sioctlh.inc

@@ -7,3 +7,4 @@ function ioctl(__fd:longint; __request:dword):longint;cdecl;external clib name '
   ---------------------------------------------------------------------}
 
 // Type  
+function ioctl(__fd:longint; __request:dword; args:pointer):longint;cdecl;external clib name 'ioctl';

packages/base/libc/sstath.inc

@@ -62,7 +62,7 @@ function fchmod(__fd:longint; __mode:__mode_t):longint;cdecl;external clib name
 function umask(__mask:__mode_t):__mode_t;cdecl;external clib name 'umask';
 function getumask:__mode_t;cdecl;external clib name 'getumask';
 
-function mkdir(__path:Pchar; __mode:__mode_t):longint;cdecl;external clib name 'mkdir';
+function __mkdir(__path:Pchar; __mode:__mode_t):longint;cdecl;external clib name 'mkdir';
 function mknod(__path:Pchar; __mode:__mode_t; __dev:__dev_t):longint;cdecl;external clib name 'mknod';
 function mkfifo(__path:Pchar; __mode:__mode_t):longint;cdecl;external clib name 'mkfifo';
 

packages/base/libc/stdioh.inc

@@ -20,7 +20,7 @@ const
    P_tmpdir = '/tmp';
 
 function remove(__filename:Pchar):longint;cdecl;external clib name 'remove';
-function rename(__old:Pchar; __new:Pchar):longint;cdecl;external clib name 'rename';
+function __rename(__old:Pchar; __new:Pchar):longint;cdecl;external clib name 'rename';
 
 function tmpfile:PFILE;cdecl;external clib name 'tmpfile';
 function tmpfile64:PFILE;cdecl;external clib name 'tmpfile64';

packages/base/libc/stringh.inc

@@ -10,7 +10,7 @@ function rawmemchr(__s:pointer; __c:longint):pointer;cdecl;external clib name 'r
 function memrchr(__s:pointer; __c:longint; __n:size_t):pointer;cdecl;external clib name 'memrchr';
 function strcpy(__dest:Pchar; __src:Pchar):Pchar;cdecl;external clib name 'strcpy';
 function strncpy(__dest:Pchar; __src:Pchar; __n:size_t):Pchar;cdecl;external clib name 'strncpy';
-function strcat(__dest:Pchar; __src:Pchar):Pchar;cdecl;external clib name 'strcat';
+function __strcat(__dest:Pchar; __src:Pchar):Pchar;cdecl;external clib name 'strcat';
 function strncat(__dest:Pchar; __src:Pchar; __n:size_t):Pchar;cdecl;external clib name 'strncat';
 function strcmp(__s1:Pchar; __s2:Pchar):longint;cdecl;external clib name 'strcmp';
 function strncmp(__s1:Pchar; __s2:Pchar; __n:size_t):longint;cdecl;external clib name 'strncmp';

packages/base/libc/unistdh.inc

@@ -39,9 +39,11 @@ function euidaccess(__name:Pchar; __type:longint):longint;cdecl;external clib na
 function lseek(__fd:longint; __offset:__off_t; __whence:longint):__off_t;cdecl;external clib name 'lseek';
 function lseek64(__fd:longint; __offset:__off64_t; __whence:longint):__off64_t;cdecl;external clib name 'lseek64';
 
+{ // Removed, conflicts with system routines
 function close(__fd:longint):longint;cdecl;external clib name 'close';
 function read(__fd:longint; __buf:pointer; __nbytes:size_t):ssize_t;cdecl;external clib name 'read';
 function write(__fd:longint; __buf:pointer; __n:size_t):ssize_t;cdecl;external clib name 'write';
+}
 
 function pread(__fd:longint; __buf:pointer; __nbytes:size_t; __offset:__off_t):ssize_t;cdecl;external clib name 'pread';
 function pwrite(__fd:longint; __buf:pointer; __n:size_t; __offset:__off_t):ssize_t;cdecl;external clib name 'pwrite';
@@ -56,7 +58,7 @@ Type
 function pipe(var __pipedes: TPipes):longint;cdecl;external clib name 'pipe';
 function pipe(__pipedes: Plongint):longint;cdecl;external clib name 'pipe';
 function alarm(__seconds:dword):dword;cdecl;external clib name 'alarm';
-function sleep(__seconds:dword):dword;cdecl;external clib name 'sleep';
+function __sleep(__seconds:dword):dword;cdecl;external clib name 'sleep';
 
 function ualarm(__value:__useconds_t; __interval:__useconds_t):__useconds_t;cdecl;external clib name 'ualarm';
 function usleep(__useconds:__useconds_t):longint;cdecl;external clib name 'usleep';
@@ -67,7 +69,7 @@ function chown(__file:Pchar; __owner:__uid_t; __group:__gid_t):longint;cdecl;ext
 function fchown(__fd:longint; __owner:__uid_t; __group:__gid_t):longint;cdecl;external clib name 'fchown';
 function lchown(__file:Pchar; __owner:__uid_t; __group:__gid_t):longint;cdecl;external clib name 'lchown';
 
-function chdir(__path:Pchar):longint;cdecl;external clib name 'chdir';
+function __chdir(__path:Pchar):longint;cdecl;external clib name 'chdir';
 function fchdir(__fd:longint):longint;cdecl;external clib name 'fchdir';
 
 function getcwd(__buf:Pchar; __size:size_t):Pchar;cdecl;external clib name 'getcwd';
@@ -137,7 +139,7 @@ function link(__from:Pchar; __to:Pchar):longint;cdecl;external clib name 'link';
 function symlink(__from:Pchar; __to:Pchar):longint;cdecl;external clib name 'symlink';
 function readlink(__path:Pchar; __buf:Pchar; __len:size_t):longint;cdecl;external clib name 'readlink';
 function unlink(__name:Pchar):longint;cdecl;external clib name 'unlink';
-function rmdir(__path:Pchar):longint;cdecl;external clib name 'rmdir';
+function __rmdir(__path:Pchar):longint;cdecl;external clib name 'rmdir';
 function tcgetpgrp(__fd:longint):__pid_t;cdecl;external clib name 'tcgetpgrp';
 function tcsetpgrp(__fd:longint; __pgrp_id:__pid_t):longint;cdecl;external clib name 'tcsetpgrp';
 function getlogin:Pchar;cdecl;external clib name 'getlogin';
@@ -162,7 +164,7 @@ function fsync(__fd:longint):longint;cdecl;external clib name 'fsync';
 function gethostid:longint;cdecl;external clib name 'gethostid';
 procedure sync;cdecl;external clib name 'sync';
 function getpagesize : longint;cdecl; external clib name 'getpagesize';
-function truncate(__file:Pchar; __length:__off_t):longint;cdecl;external clib name 'truncate';
+function __truncate(__file:Pchar; __length:__off_t):longint;cdecl;external clib name 'truncate';
 function truncate64(__file:Pchar; __length:__off64_t):longint;cdecl;external clib name 'truncate64';
 function ftruncate(__fd:longint; __length:__off_t):longint;cdecl;external clib name 'ftruncate';
 function ftruncate64(__fd:longint; __length:__off64_t):longint;cdecl;external clib name 'ftruncate64';