浏览代码

* Char -> AnsiChar

Michael VAN CANNEYT 2 年之前
父节点
当前提交
4c2b54ee0d

+ 15 - 15
rtl/linux/bunxsysc.inc

@@ -192,7 +192,7 @@ begin
   fpuname:=Do_Syscall(syscall_nr_uname,TSysParam(@name));
 end;
 
-Function fpGetDomainName(Name:PChar; NameLen:size_t):cint;
+Function fpGetDomainName(Name:PAnsiChar; NameLen:size_t):cint;
 
 Var
         srec  : utsname;
@@ -208,7 +208,7 @@ Begin
         fpgetDomainName:=0;
 End;
 
-function fpGetHostName(Name:PChar; NameLen:size_t):cint;
+function fpGetHostName(Name:PAnsiChar; NameLen:size_t):cint;
 
 Var
         srec  : utsname;
@@ -325,7 +325,7 @@ begin
  fpumask:=Do_syscall(syscall_nr_umask,cmask);
 end;
 
-Function fplink(existing:pchar;newone:pchar):cint;
+Function fplink(existing:PAnsiChar;newone:PAnsiChar):cint;
 {
   Proceduces a hard link from new to old.
   In effect, new will be the same file as old.
@@ -338,7 +338,7 @@ begin
 {$endif}
 end;
 
-Function fpmkfifo(path:pchar;mode:mode_t):cint;
+Function fpmkfifo(path:PAnsiChar;mode:mode_t):cint;
 
 begin
 
@@ -349,7 +349,7 @@ fpmkfifo:=do_syscall(syscall_nr_mknod,TSysParam(path),TSysParam(mode or S_IFIFO)
 {$endif}
 end;
 
-Function fpchmod(path:pchar;mode:mode_t):cint;
+Function fpchmod(path:PAnsiChar;mode:mode_t):cint;
 
 begin
 {$if defined(generic_linux_syscalls)}
@@ -359,7 +359,7 @@ begin
 {$endif}
 end;
 
-Function fpchown(path:pchar;owner:uid_t;group:gid_t):cint;
+Function fpchown(path:PAnsiChar;owner:uid_t;group:gid_t):cint;
 
 begin
 {$if defined(generic_linux_syscalls)}
@@ -371,7 +371,7 @@ end;
 
 {$if defined(generic_linux_syscalls)}
 
-Function fpUtime(path:pchar;times:putimbuf):cint;
+Function fpUtime(path:PAnsiChar;times:putimbuf):cint;
 var
   tsa: Array[0..1] of timespec;
 begin
@@ -385,7 +385,7 @@ end;
 
 {$elseif not defined(NO_SYSCALL_UTIME)}
 
-Function fpUtime(path:pchar;times:putimbuf):cint;
+Function fpUtime(path:PAnsiChar;times:putimbuf):cint;
 
 begin
   fputime:=do_syscall(syscall_nr_utime,TSysParam(path),TSysParam(times));
@@ -393,7 +393,7 @@ end;
 
 {$else}
 
-Function fpUtime(path:pchar;times:putimbuf):cint;
+Function fpUtime(path:PAnsiChar;times:putimbuf):cint;
 var
   tva: Array[0..1] of timeval;
 begin
@@ -438,13 +438,13 @@ begin
  fpfcntl:=do_syscall(syscall_nr_fcntl,fildes,cmd);
 end;
 
-function fpexecve(path:pchar;argv:ppchar;envp:ppchar):cint;
+function fpexecve(path:PAnsiChar;argv:PPAnsiChar;envp:PPAnsiChar):cint;
 
 Begin
   fpexecve:=do_syscall(syscall_nr_Execve,TSysParam(path),TSysParam(argv),TSysParam(envp));
 End;
 
-function fpexecv(path:pchar;argv:ppchar):cint;
+function fpexecv(path:PAnsiChar;argv:PPAnsiChar):cint;
 
 Begin
   fpexecv:=do_syscall(syscall_nr_Execve,TSysParam(path),TSysParam(argv),TSysParam(envp));
@@ -514,7 +514,7 @@ begin
 end;
 {$endif}
 
-Function fpLstat(path:pchar;Info:pstat):cint;
+Function fpLstat(path:PAnsiChar;Info:pstat):cint;
 {
   Get all information on a link (the link itself), and return it in info.
 }
@@ -607,7 +607,7 @@ begin
 end;
 
 
-Function fpSymlink(oldname,newname:pchar):cint;
+Function fpSymlink(oldname,newname:PAnsiChar):cint;
 {
   We need this for erase
 }
@@ -626,7 +626,7 @@ end;
 {$define FPC_ALIGN_DUMMY}
 {$endif}
 
-function Fppread(fd: cint; buf: pchar; nbytes : size_t; offset:Toff): ssize_t; [public, alias : 'FPC_SYSC_PREAD'];
+function Fppread(fd: cint; buf: PAnsiChar; nbytes : size_t; offset:Toff): ssize_t; [public, alias : 'FPC_SYSC_PREAD'];
 
 begin
 {$ifdef CPU64}
@@ -640,7 +640,7 @@ begin
 {$endif}
 end;
 
-function Fppwrite(fd: cint;buf:pchar; nbytes : size_t; offset:Toff): ssize_t; [public, alias : 'FPC_SYSC_PWRITE'];
+function Fppwrite(fd: cint;buf:PAnsiChar; nbytes : size_t; offset:Toff): ssize_t; [public, alias : 'FPC_SYSC_PWRITE'];
 
 begin
 {$ifdef CPU64}

+ 1 - 1
rtl/linux/errnostr.inc

@@ -15,7 +15,7 @@
 
 const
   sys_errn=125;
-  sys_errlist:array[0..sys_errn-1] of pchar = (
+  sys_errlist:array[0..sys_errn-1] of PAnsiChar = (
         'Success',                              { 0 }
         'Operation not permitted',              { EPERM }
         'No such file or directory',            { ENOENT }

+ 4 - 4
rtl/linux/fpcylix.pp

@@ -30,8 +30,8 @@ unit fpcylix;
       MainInstance: PtrUInt;
 
     function GetModuleName(Module: HMODULE): string;
-    function GetModuleHandle(ModuleName: PChar): HMODULE;
-    function GetModuleFileName(Module: HMODULE; Buffer: PChar; BufLen: Integer): Integer;
+    function GetModuleHandle(ModuleName: PAnsiChar): HMODULE;
+    function GetModuleFileName(Module: HMODULE; Buffer: PAnsiChar; BufLen: Integer): Integer;
 
   implementation
 
@@ -41,13 +41,13 @@ unit fpcylix;
       end;
 
 
-    function GetModuleHandle(ModuleName: PChar): HMODULE;
+    function GetModuleHandle(ModuleName: PAnsiChar): HMODULE;
       begin
         result:=NilHandle;
       end;
 
 
-    function GetModuleFileName(Module: HMODULE; Buffer: PChar; BufLen: Integer): Integer;
+    function GetModuleFileName(Module: HMODULE; Buffer: PAnsiChar; BufLen: Integer): Integer;
       begin
         result:=0;
       end;

+ 1 - 1
rtl/linux/i386/si_c.inc

@@ -34,7 +34,7 @@
 }
 
 var
-  libc_environ: pchar; external name '__environ';
+  libc_environ: PAnsiChar; external name '__environ';
   libc_fpu_control: word; external name '__fpu_control';
   libc_init_proc: procedure; external name '_init';
   libc_fini_proc: procedure; external name '_fini';

+ 2 - 2
rtl/linux/i386/si_c21.inc

@@ -82,9 +82,9 @@ asm
   {$endif FPC_PIC}
 
         { int __libc_start_main(
-		int *(main) (int, char * *, char * *), 
+		int *(main) (int, char **, char **), 
 		int argc, 
-		char * * ubp_av, 
+		AnsiChar * * ubp_av, 
 		void (*init) (void), 
 		void (*fini) (void), 
 		void (*rtld_fini) (void), 

+ 2 - 2
rtl/linux/i386/si_uc.inc

@@ -121,9 +121,9 @@ asm
   {$endif FPC_PIC}
 
         { int __libc_start_main(
-		int *(main) (int, char * *, char * *), 
+		int *(main) (int, char **, char **), 
 		int argc, 
-		char * * ubp_av, 
+		char ** ubp_av, 
 		void (*init) (void), 
 		void (*fini) (void), 
 		void (*rtld_fini) (void), 

+ 1 - 1
rtl/linux/i386/syscall.inc

@@ -48,7 +48,7 @@ var
 
 procedure InitSyscallIntf;
 var
-  ep: PPChar;
+  ep: PPAnsiChar;
   auxv: PElf32AuxiliaryVector;
 begin
 

+ 7 - 7
rtl/linux/linux.pp

@@ -403,7 +403,7 @@ Type
     mask   : cuint32;
     cookie : cuint32;
     len    : cuint32;
-    name   : char;
+    name   : AnsiChar;
   end;
   Pinotify_event = ^inotify_event;
 
@@ -453,7 +453,7 @@ function inotify_init1(flags:cint):cint;  {$ifdef FPC_USE_LIBC} cdecl; external
 
 { Add watch of object NAME to inotify instance FD.
   Notify about events specified by MASK.   }
-function inotify_add_watch(fd:cint; name:Pchar; mask:cuint32):cint;  {$ifdef FPC_USE_LIBC} cdecl; external name 'inotify_add_watch'; {$ENDIF}
+function inotify_add_watch(fd:cint; name:PAnsiChar; mask:cuint32):cint;  {$ifdef FPC_USE_LIBC} cdecl; external name 'inotify_add_watch'; {$ENDIF}
 
 { Remove the watch specified by WD from the inotify instance FD.   }
 function inotify_rm_watch(fd:cint; wd: cint):cint;  {$ifdef FPC_USE_LIBC} cdecl; external name 'inotify_rm_watch'; {$ENDIF}
@@ -542,7 +542,7 @@ Type
   end;
   pstatx = ^tstatx;
 
-  function statx(dfd: cint; filename: pchar; flags,mask: cuint; var buf: tstatx):cint; {$ifdef FPC_USE_LIBC} cdecl; weakexternal name 'statx'; {$ENDIF}
+  function statx(dfd: cint; filename: PAnsiChar; flags,mask: cuint; var buf: tstatx):cint; {$ifdef FPC_USE_LIBC} cdecl; weakexternal name 'statx'; {$ENDIF}
 
 Type
    kernel_time64_t = clonglong;
@@ -556,7 +556,7 @@ Type
    tkernel_timespecs = array[0..1] of kernel_timespec;
 
 {$ifndef android}
-Function utimensat(dfd: cint; path:pchar;const times:tkernel_timespecs;flags:cint):cint; {$ifdef FPC_USE_LIBC} cdecl; external name 'utimensat'; {$ENDIF}
+Function utimensat(dfd: cint; path:PAnsiChar;const times:tkernel_timespecs;flags:cint):cint; {$ifdef FPC_USE_LIBC} cdecl; external name 'utimensat'; {$ENDIF}
 Function futimens(fd: cint; const times:tkernel_timespecs):cint; {$ifdef FPC_USE_LIBC} cdecl; external name 'futimens'; {$ENDIF}
 {$endif android}
 
@@ -828,7 +828,7 @@ begin
 {$endif}
 end;
 
-function inotify_add_watch(fd:cint; name:Pchar; mask:cuint32):cint;
+function inotify_add_watch(fd:cint; name:PAnsiChar; mask:cuint32):cint;
 
 begin
   inotify_add_watch:=do_SysCall(syscall_nr_inotify_add_watch,tsysparam(fd),tsysparam(name),tsysparam(mask));
@@ -870,14 +870,14 @@ begin
 end;
 
 
-function statx(dfd: cint; filename: pchar; flags,mask: cuint; var buf: tstatx):cint;
+function statx(dfd: cint; filename: PAnsiChar; flags,mask: cuint; var buf: tstatx):cint;
 begin
   statx:=do_syscall(syscall_nr_statx,TSysParam(dfd),TSysParam(filename),TSysParam(flags),TSysParam(mask),TSysParam(@buf));
 end;
 
 
 {$ifndef android}
-Function utimensat(dfd: cint; path:pchar;const times:tkernel_timespecs;flags:cint):cint;
+Function utimensat(dfd: cint; path:PAnsiChar;const times:tkernel_timespecs;flags:cint):cint;
 var
   tsa: Array[0..1] of timespec;
 begin

+ 4 - 4
rtl/linux/linuxvcs.pp

@@ -14,12 +14,12 @@ function try_grab_vcsa:boolean;
 
 uses baseunix,strings;
 
-function try_grab_vcsa_in_path(path:Pchar;len:cardinal):boolean;
+function try_grab_vcsa_in_path(path:PAnsiChar;len:cardinal):boolean;
 
 const  grab_vcsa='/grab_vcsa';
-       grab_vcsa_s:array[1..length(grab_vcsa)] of char=grab_vcsa;
+       grab_vcsa_s:array[1..length(grab_vcsa)] of AnsiChar=grab_vcsa;
 
-var p:Pchar;
+var p:PAnsiChar;
     child:Tpid;
     status:cint;
     pstat:stat;
@@ -56,7 +56,7 @@ function try_grab_vcsa:boolean;
  you when you log out. We try to call a setuid root helper which chowns
  the vcsa device so we can get access to the screen buffer...}
 
-var path,p:Pchar;
+var path,p:PAnsiChar;
 
 begin
   try_grab_vcsa:=false;

+ 1 - 1
rtl/linux/mips64/si_c.inc

@@ -13,7 +13,7 @@
  **********************************************************************}
 
 var
-  libc_environ: pchar; external name '__environ';
+  libc_environ: PAnsiChar; external name '__environ';
   libc_fpu_control: word; external name '__fpu_control';
   libc_init_proc: procedure; external name '_init';
   libc_fini_proc: procedure; external name '_fini';

+ 7 - 7
rtl/linux/osmacro.inc

@@ -85,13 +85,13 @@ end;
 
 {$ifdef FPC_USE_LIBC}
 function __fxstat(__ver,filedes : cint; var __stat: tstat): cint; cdecl; external clib name '__fxstat'+suffix64bit;
-function __xstat(__ver : cint;FileName: PChar; var __stat: tstat): cint; cdecl; external clib name '__xstat'+suffix64bit;
-function __lxstat(__ver : cint; FileName: PChar; var __stat: tstat): cint; cdecl; external clib name '__lxstat'+suffix64bit;
+function __xstat(__ver : cint;FileName: PAnsiChar; var __stat: tstat): cint; cdecl; external clib name '__xstat'+suffix64bit;
+function __lxstat(__ver : cint; FileName: PAnsiChar; var __stat: tstat): cint; cdecl; external clib name '__lxstat'+suffix64bit;
 {
 function __fxstat64(__ver : cint; FileDes: Integer; var __stat: tstat): cint; cdecl; external clib name '__fxstat64';
-function __xstat64(__ver : cint; FileName: PChar; var __stat: tstat): cint; cdecl; external clib name '__xstat64';
-function __lxstat64(__ver : cint; FileName: PChar; var __stat: tstat): cint; cdecl; external clib name '__lxstat64';
-function __xmknod(__ver : cint; Pathname: PChar; Mode: mode_t; var Device: dev_t): cint; cdecl; external clib name '__xmknod';
+function __xstat64(__ver : cint; FileName: PAnsiChar; var __stat: tstat): cint; cdecl; external clib name '__xstat64';
+function __lxstat64(__ver : cint; FileName: PAnsiChar; var __stat: tstat): cint; cdecl; external clib name '__lxstat64';
+function __xmknod(__ver : cint; Pathname: PAnsiChar; Mode: mode_t; var Device: dev_t): cint; cdecl; external clib name '__xmknod';
 }
 {$define FPC_HAS_BASEUNIX_STAT}
 function  FpFstat(fd : cint; var sb : stat): cint;inline;
@@ -100,13 +100,13 @@ function  FpFstat(fd : cint; var sb : stat): cint;inline;
   end;
 
 
-function  fpLstat(path:pchar;Info:pstat):cint;inline;
+function  fpLstat(path:PAnsiChar;Info:pstat):cint;inline;
   begin
     fpLstat:=__lxstat(_STAT_VER,path,Info^);
   end;
 
 
-function  FpStat(path: pchar; var buf : stat): cint;inline;
+function  FpStat(path: PAnsiChar; var buf : stat): cint;inline;
   begin
     FpStat:=__xstat(_STAT_VER,path,buf);
   end;

+ 17 - 17
rtl/linux/ossysc.inc

@@ -46,7 +46,7 @@ end;
                --- File:File handling related calls ---
 *****************************************************************************}
 
-function Fpopen(path: pchar; flags : cint; mode: mode_t):cint; [public, alias : 'FPC_SYSC_OPEN'];
+function Fpopen(path: PAnsiChar; flags : cint; mode: mode_t):cint; [public, alias : 'FPC_SYSC_OPEN'];
 
 Begin
 {$if defined(generic_linux_syscalls)}
@@ -74,19 +74,19 @@ begin
 {$endif}
 end;
 
-function Fpread(fd: cint; buf: pchar; nbytes : size_t): ssize_t; [public, alias : 'FPC_SYSC_READ'];
+function Fpread(fd: cint; buf: PAnsiChar; nbytes : size_t): ssize_t; [public, alias : 'FPC_SYSC_READ'];
 
 begin
   Fpread:=do_syscall(syscall_nr_read,Fd,TSysParam(buf),nbytes);
 end;
 
-function Fpwrite(fd: cint;buf:pchar; nbytes : size_t): ssize_t; [public, alias : 'FPC_SYSC_WRITE'];
+function Fpwrite(fd: cint;buf:PAnsiChar; nbytes : size_t): ssize_t; [public, alias : 'FPC_SYSC_WRITE'];
 
 begin
  Fpwrite:=do_syscall(syscall_nr_write,Fd,TSysParam(buf),nbytes);
 end;
 
-function Fpunlink(path: pchar): cint; [public, alias : 'FPC_SYSC_UNLINK'];
+function Fpunlink(path: PAnsiChar): cint; [public, alias : 'FPC_SYSC_UNLINK'];
 
 begin
 {$if defined(generic_linux_syscalls)}
@@ -96,7 +96,7 @@ begin
 {$endif}
 end;
 
-function Fprename(old : pchar; newpath: pchar): cint; [public, alias : 'FPC_SYSC_RENAME'];
+function Fprename(old : PAnsiChar; newpath: PAnsiChar): cint; [public, alias : 'FPC_SYSC_RENAME'];
 
 begin
 {$if defined(generic_linux_syscalls)}
@@ -119,7 +119,7 @@ end;
 
 {$i cp_new_stat.inc}
 
-function Fpstat(path: pchar; var buf: stat):cint; [public, alias : 'FPC_SYSC_STAT'];
+function Fpstat(path: pansichar; var buf: stat):cint; [public, alias : 'FPC_SYSC_STAT'];
 
 var
   nbuf:tstatx64;
@@ -132,7 +132,7 @@ end;
 
 {$else defined(use_statx_syscall)}
 
-function Fpstat(path: pchar; var buf: stat):cint; [public, alias : 'FPC_SYSC_STAT'];
+function Fpstat(path: PAnsiChar; var buf: stat):cint; [public, alias : 'FPC_SYSC_STAT'];
 
 begin
 { standard stat call is 32 bit on sparc64, so explicitly force a stat64 call }
@@ -152,13 +152,13 @@ end;
                --- Directory:Directory related calls ---
 *****************************************************************************}
 
-function Fpchdir(path : pchar): cint; [public, alias : 'FPC_SYSC_CHDIR'];
+function Fpchdir(path : PAnsiChar): cint; [public, alias : 'FPC_SYSC_CHDIR'];
 
 begin
  Fpchdir:=do_syscall(syscall_nr_chdir,TSysParam(path));
 end;
 
-function Fpmkdir(path : pchar; mode: mode_t):cint; [public, alias : 'FPC_SYSC_MKDIR'];
+function Fpmkdir(path : PAnsiChar; mode: mode_t):cint; [public, alias : 'FPC_SYSC_MKDIR'];
 
 begin
 {$if defined(generic_linux_syscalls)}
@@ -168,7 +168,7 @@ begin
 {$endif}
 end;
 
-function Fprmdir(path : pchar): cint;  [public, alias : 'FPC_SYSC_RMDIR'];
+function Fprmdir(path : PAnsiChar): cint;  [public, alias : 'FPC_SYSC_RMDIR'];
 
 begin
 {$if defined(generic_linux_syscalls)}
@@ -178,7 +178,7 @@ begin
 {$endif}
 end;
 
-function Fpopendir(dirname : pchar): pdir;  [public, alias : 'FPC_SYSC_OPENDIR'];
+function Fpopendir(dirname : PAnsiChar): pdir;  [public, alias : 'FPC_SYSC_OPENDIR'];
 
 var
   fd:cint;
@@ -481,7 +481,7 @@ End;
 
 // Look at execve variants later, when overloaded is determined.
 {
-function Fpexecve(path : pathstr; argv : ppchar; envp: ppchar): cint;
+function Fpexecve(path : pathstr; argv : PPAnsiChar; envp: PPAnsiChar): cint;
 }
 {
   Replaces the current program by the program specified in path,
@@ -496,7 +496,7 @@ Begin
 End;
 }
 {
-function Fpexecve(path : pchar; argv : ppchar; envp: ppchar): cint;  [public, alias : 'FPC_SYSC_EXECVE'];
+function Fpexecve(path : PAnsiChar; argv : PPAnsiChar; envp: PPAnsiChar): cint;  [public, alias : 'FPC_SYSC_EXECVE'];
 }
 {
   Replaces the current program by the program specified in path,
@@ -525,7 +525,7 @@ begin
 {$endif WAIT4}
 end;
 
-function Fpaccess(pathname : pchar; amode : cint): cint; [public, alias : 'FPC_SYSC_ACCESS'];
+function Fpaccess(pathname : PAnsiChar; amode : cint): cint; [public, alias : 'FPC_SYSC_ACCESS'];
 {
   Test users access rights on the specified file.
   Mode is a mask xosisting of one or more of R_OK, W_OK, X_OK, F_OK.
@@ -686,7 +686,7 @@ begin
  FpGetPID:=do_syscall(syscall_nr_getpid);
 end;
 
-Function FpReadLink(name,linkname:pchar;maxlen:size_t):cint;  [public, alias : 'FPC_SYSC_READLINK'];
+Function FpReadLink(name,linkname:PAnsiChar;maxlen:size_t):cint;  [public, alias : 'FPC_SYSC_READLINK'];
 
 begin
 {$if defined(generic_linux_syscalls)}
@@ -724,10 +724,10 @@ begin
   FpNanoSleep:=Do_SysCall(syscall_nr_nanosleep,TSysParam(req),TSysParam(rem));
 end;
 
-function fpgetcwd(path : pchar; siz:tsize):pchar;  [public, alias : 'FPC_SYSC_GETCWD'];
+function fpgetcwd(path : PAnsiChar; siz:tsize):PAnsiChar;  [public, alias : 'FPC_SYSC_GETCWD'];
 
 begin
-  fpgetcwd:=pchar(Do_Syscall(Syscall_nr_getcwd,TSysParam(Path),TSysParam(siz)));
+  fpgetcwd:=PAnsiChar(Do_Syscall(Syscall_nr_getcwd,TSysParam(Path),TSysParam(siz)));
 end;
 
 function fpgettimeofday(tp: ptimeval;tzp:ptimezone):cint; [public, alias: 'FPC_SYSC_GETTIMEOFDAY'];

+ 8 - 8
rtl/linux/ostypes.inc

@@ -57,13 +57,13 @@ TYPE
 
    { system information services }
    UtsName   = Record
-                Sysname : Array[0..UTSNAME_LENGTH -1] OF Char;   // Name of this OS
-                Nodename: Array[0..UTSNAME_NODENAME_LENGTH-1] OF Char;   // Name of this network node.
-                Release : Array[0..UTSNAME_LENGTH -1] OF Char;   // Release level.
-                Version : Array[0..UTSNAME_LENGTH -1] OF Char;   // Version level.
-                Machine : Array[0..UTSNAME_LENGTH -1] OF Char;   // Hardware type.
+                Sysname : Array[0..UTSNAME_LENGTH -1] OF AnsiChar;   // Name of this OS
+                Nodename: Array[0..UTSNAME_NODENAME_LENGTH-1] OF AnsiChar;   // Name of this network node.
+                Release : Array[0..UTSNAME_LENGTH -1] OF AnsiChar;   // Release level.
+                Version : Array[0..UTSNAME_LENGTH -1] OF AnsiChar;   // Version level.
+                Machine : Array[0..UTSNAME_LENGTH -1] OF AnsiChar;   // Hardware type.
                {$ifdef usedomain}
-                Domain  : array[0..UTSNAME_DOMAIN_LENGTH-1] of char {$ifndef ver2_2} platform; {$endif}  // Linux addition "Domain"
+                Domain  : array[0..UTSNAME_DOMAIN_LENGTH-1] of AnsiChar {$ifndef ver2_2} platform; {$endif}  // Linux addition "Domain"
                {$endif}
                end;
   TUtsName   = UtsName;
@@ -153,7 +153,7 @@ type
                 d_off         : off_t;
                 d_reclen      : cushort;                        // length of string in d_name
                 d_type        : cuchar;                         // file type, see below
-                d_name        : array[0..4095-sizeof(ino64_t)-sizeof(off_t)-sizeof(cushort)-sizeof(cuchar)] of char;  // name buffer + padding for extra records; align total record size to a page size
+                d_name        : array[0..4095-sizeof(ino64_t)-sizeof(off_t)-sizeof(cushort)-sizeof(cuchar)] of AnsiChar;  // name buffer + padding for extra records; align total record size to a page size
                end;
   TDirent  = Dirent;
   pDirent  = ^Dirent;
@@ -175,7 +175,7 @@ type
         // new libc one. NOTE that off_t must be real, so 64-bit ifdef
    Dir       = Record   // packing doesn't matter. This is a userland struct.
                 fd      : cint;
-                data    : pchar;
+                data    : PAnsiChar;
                 allocation: size_t;
                 _size     : size_t;
                 offset    : size_t;

+ 1 - 1
rtl/linux/pmutext.inc

@@ -32,7 +32,7 @@
   MUTEXTYPENAME = record
     case byte of
       0 : (
-            __size : array[0..__SIZEOF_PTHREAD_MUTEX_T-1] of char;
+            __size : array[0..__SIZEOF_PTHREAD_MUTEX_T-1] of AnsiChar;
           );
       1 : (
              __align : sizeint;

+ 2 - 2
rtl/linux/powerpc64/si_c.inc

@@ -662,7 +662,7 @@ procedure __libc_start_main(r3,r4,r5,r6,r7,r8,r9: pointer); cdecl; external;
 var
   __fpc_ret: pointer;
 
-procedure save_argc_argv_envp_stkptr_fpcret(argc: longint; argv, envp: ppchar; stkptr: pointer);
+procedure save_argc_argv_envp_stkptr_fpcret(argc: longint; argv, envp: PPAnsiChar; stkptr: pointer);
   begin
     operatingsystem_parameter_argc:=argc;
     operatingsystem_parameter_argv:=argv;
@@ -685,7 +685,7 @@ label
  * This is our FreePascal main procedure which is called by
  * libc after initializing.
  *}
-procedure main_stub(argc: longint; argv, envp: ppchar); cdecl; assembler; nostackframe;
+procedure main_stub(argc: longint; argv, envp: PPAnsiChar); cdecl; assembler; nostackframe;
   asm
 {$if defined(_CALL_ELF) and (_CALL_ELF = 2)}
 .L1:

+ 2 - 2
rtl/linux/powerpc64/si_dll.inc

@@ -629,7 +629,7 @@ var
   TOCSTART: pointer; external name '.TOC.';
 
 
-procedure save_argc_argv_envp_stkptr_fpcret(argc: longint; argv, envp: ppchar; stkptr: pointer);
+procedure save_argc_argv_envp_stkptr_fpcret(argc: longint; argv, envp: PPAnsiChar; stkptr: pointer);
   begin
     operatingsystem_parameter_argc:=argc;
     operatingsystem_parameter_argv:=argv;
@@ -643,7 +643,7 @@ procedure save_argc_argv_envp_stkptr_fpcret(argc: longint; argv, envp: ppchar; s
  * The document "64-bit PowerPC ELF Application Binary Interface Supplement 1.9"
  * pg. 24f specifies the register contents.
  *}
-procedure _FPC_shared_lib_start(argc: longint; argv, envp: ppchar); cdecl; public name 'FPC_SHARED_LIB_START'; public name '_start'; assembler; nostackframe;
+procedure _FPC_shared_lib_start(argc: longint; argv, envp: PPAnsiChar); cdecl; public name 'FPC_SHARED_LIB_START'; public name '_start'; assembler; nostackframe;
   asm
 {$if defined(_CALL_ELF) and (_CALL_ELF = 2)}
 .L1:

+ 2 - 2
rtl/linux/powerpc64/si_g.inc

@@ -675,7 +675,7 @@ procedure firstproc;
 begin
 end;
 
-procedure save_argc_argv_envp_stkptr_fpcret_call_monstartup(argc: longint; argv, envp: ppchar; stkptr: pointer);
+procedure save_argc_argv_envp_stkptr_fpcret_call_monstartup(argc: longint; argv, envp: PPAnsiChar; stkptr: pointer);
   var
     start: pointer;
   begin
@@ -707,7 +707,7 @@ label
  * This is our FreePascal main procedure which is called by
  * libc after initializing.
  *}
-procedure main_stub(argc: longint; argv, envp: ppchar); cdecl; assembler; nostackframe;
+procedure main_stub(argc: longint; argv, envp: PPAnsiChar); cdecl; assembler; nostackframe;
   asm
 {$if defined(_CALL_ELF) and (_CALL_ELF = 2)}
 .L1:

+ 2 - 2
rtl/linux/powerpc64/si_prc.inc

@@ -634,7 +634,7 @@ _restvr_31: addi r12,r0,-16
 
 
 
-procedure save_argc_argv_envp_stkptr(argc: longint; argv: ppchar; stkptr: pointer);
+procedure save_argc_argv_envp_stkptr(argc: longint; argv: PPAnsiChar; stkptr: pointer);
   begin
     operatingsystem_parameter_argc:=argc;
     operatingsystem_parameter_argv:=argv;
@@ -694,7 +694,7 @@ procedure _start; cdecl; public; assembler; nostackframe;
 procedure _dynamic_start(r3,r4,r5,r6: pointer; r7: tdlfiniproc); cdecl; public;
   begin
     dlexitproc:=r7;
-    save_argc_argv_envp_stkptr(ptrint(r3),ppchar(r4),sptr);
+    save_argc_argv_envp_stkptr(ptrint(r3),PPAnsiChar(r4),sptr);
     PASCALMAIN;
   end;
 

+ 2 - 2
rtl/linux/pthread.inc

@@ -183,7 +183,7 @@ Type
     function sem_init (__sem:Psem_t; __pshared:longint; __value:dword):longint;cdecl;external;
     function sem_destroy  (__sem:Psem_t):longint;cdecl;external;
     function sem_close (__sem:Psem_t):longint;cdecl;external;
-    function sem_unlink (__name:Pchar):longint;cdecl;external;
+    function sem_unlink (__name:PAnsiChar):longint;cdecl;external;
     function sem_wait (__sem:Psem_t):longint;cdecl;external;
     function sem_timedwait (__sem:Psem_t; __abs_timeout:ptimespec):longint;cdecl;external;
     function sem_trywait  (__sem:Psem_t):longint;cdecl;external;
@@ -265,7 +265,7 @@ Var
     sem_init     :   function (__sem:Psem_t; __pshared:longint; __value:dword):longint;cdecl;
     sem_destroy  :   function (__sem:Psem_t):longint;cdecl;
     sem_close    :   function (__sem:Psem_t):longint;cdecl;
-    sem_unlink   :   function (__name:Pchar):longint;cdecl;
+    sem_unlink   :   function (__name:PAnsiChar):longint;cdecl;
     sem_wait     :   function (__sem:Psem_t):longint;cdecl;
     sem_timedwait:   function (__sem:Psem_t; __abs_timeout:ptimespec):longint;cdecl;
     sem_trywait  :   function (__sem:Psem_t):longint;cdecl;

+ 8 - 8
rtl/linux/ptypes.inc

@@ -223,7 +223,7 @@ Type
   mbstate_value_t = record
     case byte of
       0: (__wch: wint_t);
-      1: (__wchb: array[0..3] of char);
+      1: (__wchb: array[0..3] of AnsiChar);
   end;
 
   mbstate_t = record
@@ -241,7 +241,7 @@ Type
   pthread_attr_t = record
     case byte of
       0 : (
-             __size : array[0..__SIZEOF_PTHREAD_ATTR_T-1] of char;
+             __size : array[0..__SIZEOF_PTHREAD_ATTR_T-1] of AnsiChar;
           );
       1 : (
              __align : clong;
@@ -262,7 +262,7 @@ Type
   pthread_mutexattr_t = record
     case byte of
       0 : (
-             __size : array[0..__SIZEOF_PTHREAD_MUTEXATTR_T-1] of char;
+             __size : array[0..__SIZEOF_PTHREAD_MUTEXATTR_T-1] of AnsiChar;
           );
       1 : (
              __align : cint;
@@ -272,7 +272,7 @@ Type
   pthread_cond_t = record
     case byte of
       0 : (
-             __size : array[0..__SIZEOF_PTHREAD_COND_T-1] of char;
+             __size : array[0..__SIZEOF_PTHREAD_COND_T-1] of AnsiChar;
           );
       1 : (
              ___align : clonglong;
@@ -282,7 +282,7 @@ Type
   pthread_condattr_t = record
     case byte of
       0 : (
-             __size : array[0..__SIZEOF_PTHREAD_CONDATTR_T-1] of char;
+             __size : array[0..__SIZEOF_PTHREAD_CONDATTR_T-1] of AnsiChar;
           );
       1 : (
              __align : cint;
@@ -295,7 +295,7 @@ type
   pthread_rwlock_t = record // should be 56 for 64-bit, 32 bytes for 32-bit mantis #21552
     case byte of
       0 : (
-             __size : array[0..__SIZEOF_PTHREAD_RWLOCK_T-1] of char;
+             __size : array[0..__SIZEOF_PTHREAD_RWLOCK_T-1] of AnsiChar;
           );
       1 : (
              __align : clong;
@@ -305,7 +305,7 @@ type
   pthread_rwlockattr_t = record
     case byte of
       0 : (
-             __size : array[0..__SIZEOF_PTHREAD_RWLOCKATTR_T-1] of char;
+             __size : array[0..__SIZEOF_PTHREAD_RWLOCKATTR_T-1] of AnsiChar;
           );
       1 : (
              __align : cint;
@@ -315,7 +315,7 @@ type
   sem_t = record
     case byte of
       0 : (
-             __size : array[0..__SIZEOF_SEM_T-1] of char;
+             __size : array[0..__SIZEOF_SEM_T-1] of AnsiChar;
           );
       1 : (
              __align : clonglong;

+ 2 - 2
rtl/linux/riscv64/si_c.inc

@@ -22,13 +22,13 @@ procedure ini_dummy;
   begin
   end;
 
-procedure libc_start_main(main: TProcedure; argc: ptruint; argv: ppchar; init, fini, rtld_fini: TProcedure; stack_end: pointer); cdecl; external name '__libc_start_main';
+procedure libc_start_main(main: TProcedure; argc: ptruint; argv: PPAnsiChar; init, fini, rtld_fini: TProcedure; stack_end: pointer); cdecl; external name '__libc_start_main';
 procedure libc_exit(code: ptruint); cdecl; external name 'exit';
 
 procedure _FPC_rv_enter(at_exit: TProcedure; sp: pptruint);
   var
     argc: ptruint;
-    argv: ppchar;
+    argv: PPAnsiChar;
   begin
     argc:=sp[0];
     argv:=@sp[1];

+ 2 - 2
rtl/linux/riscv64/si_g.inc

@@ -25,7 +25,7 @@ procedure ini_dummy;
   begin
   end;
 
-procedure libc_start_main(main: TProcedure; argc: ptruint; argv: ppchar; init, fini, rtld_fini: TProcedure; stack_end: pointer); cdecl; external name '__libc_start_main';
+procedure libc_start_main(main: TProcedure; argc: ptruint; argv: PPAnsiChar; init, fini, rtld_fini: TProcedure; stack_end: pointer); cdecl; external name '__libc_start_main';
 procedure libc_exit(code: ptruint); cdecl; external name 'exit';
 
 procedure monstartup(low_pc,high_pc: pointer); cdecl; external;
@@ -35,7 +35,7 @@ procedure atexit(p: pointer); cdecl; external;
 procedure _FPC_rv_enter(at_exit: TProcedure; sp: pptruint);
   var
     argc: ptruint;
-    argv: ppchar;
+    argv: PPAnsiChar;
   begin
     argc:=sp[0];
     argv:=@sp[1];

+ 4 - 4
rtl/linux/si_intf.inc

@@ -7,13 +7,13 @@
 {$if not defined(FPC_BOOTSTRAP_INDIRECT_ENTRY) and not defined(FPC_HAS_INDIRECT_ENTRY_INFORMATION)}
 var
   initialstkptr: pointer; public name '__stkptr';
-  operatingsystem_parameter_envp: ppchar; public name 'operatingsystem_parameter_envp';
+  operatingsystem_parameter_envp: PPAnsiChar; public name 'operatingsystem_parameter_envp';
   operatingsystem_parameter_argc: longint; public name 'operatingsystem_parameter_argc';
-  operatingsystem_parameter_argv: ppchar; public name 'operatingsystem_parameter_argv';
+  operatingsystem_parameter_argv: PPAnsiChar; public name 'operatingsystem_parameter_argv';
 {$elseif defined(FPC_BOOTSTRAP_INDIRECT_ENTRY)}
 var
   initialstkptr: pointer; external name '__stkptr';
-  operatingsystem_parameter_envp: ppchar; external name 'operatingsystem_parameter_envp';
+  operatingsystem_parameter_envp: PPAnsiChar; external name 'operatingsystem_parameter_envp';
   operatingsystem_parameter_argc: longint; external name 'operatingsystem_parameter_argc';
-  operatingsystem_parameter_argv: ppchar; external name 'operatingsystem_parameter_argv';
+  operatingsystem_parameter_argv: PPAnsiChar; external name 'operatingsystem_parameter_argv';
 {$endif not FPC_BOOTSTRAP_INDIRECT_ENTRY and not FPC_HAS_INDIRECT_ENTRY_INFORMATION}

+ 1 - 1
rtl/linux/sparc64/si_c.inc

@@ -13,7 +13,7 @@
  **********************************************************************}
 
 var
-  libc_environ: pchar; external name '__environ';
+  libc_environ: PAnsiChar; external name '__environ';
   libc_fpu_control: word; external name '__fpu_control';
   libc_init_proc: procedure; external name '_init';
   libc_fini_proc: procedure; external name '_fini';

+ 2 - 2
rtl/linux/sysosh.inc

@@ -35,8 +35,8 @@ type
   {$define HAS_ENTRYINFORMATION_OS}
   TEntryInformationOS = record
     argc: longint;
-    argv: ppchar;
-    envp: ppchar;
+    argv: PPAnsiChar;
+    envp: PPAnsiChar;
     stkptr: pointer;
     stklen: sizeuint;
     haltproc: procedure(e:longint);cdecl;

+ 8 - 8
rtl/linux/system.pp

@@ -45,8 +45,8 @@ const
 {$endif defined(VER3_0) and defined(CPUX86_64)}
 
 
-function get_cmdline:Pchar; deprecated 'use paramstr' ;
-property cmdline:Pchar read get_cmdline;
+function get_cmdline:PAnsiChar; deprecated 'use paramstr' ;
+property cmdline:PAnsiChar read get_cmdline;
 
 {$if defined(CPURISCV32) or defined(CPURISCV64) or defined(CPUARM) or defined(CPUM68K) or defined(CPUXTENSA)}
 {$define FPC_LOAD_SOFTFPU}
@@ -83,7 +83,7 @@ var
 {$endif}
 
 const
-  calculated_cmdline:Pchar=nil;
+  calculated_cmdline:PAnsiChar=nil;
 {$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
 {$define FPC_SYSTEM_HAS_OSSETUPENTRYINFORMATION}
 procedure OsSetupEntryInformation(constref info: TEntryInformation); forward;
@@ -427,7 +427,7 @@ Begin
 End;
 
 
-{function BackPos(c:char; const s: shortstring): integer;
+{function BackPos(c:AnsiChar; const s: shortstring): integer;
 var
  i: integer;
 Begin
@@ -454,7 +454,7 @@ begin
   { it must also be an absolute filename, linux 2.0 points to a memory
     location so this will skip that }
   if (i>0) and (execpathstr[1]='/') then
-     execpathstr[0]:=char(i);
+     execpathstr[0]:=AnsiChar(i);
 end;
 
 function paramstr(l: longint) : string;
@@ -506,11 +506,11 @@ var
   len,j,
   size,i : longint;
   found  : boolean;
-  buf    : pchar;
+  buf    : PAnsiChar;
 
   procedure AddBuf;
   var
-    p : Pchar;
+    p : PAnsiChar;
   begin
     p:=SysGetmem(size+bufsize);
     move(calculated_cmdline^,p^,size);
@@ -569,7 +569,7 @@ begin
   SysFreeMem(buf);
 end;
 
-function get_cmdline:Pchar;
+function get_cmdline:PAnsiChar;
 
 begin
   if calculated_cmdline=nil then

+ 1 - 1
rtl/linux/termio.pp

@@ -51,7 +51,7 @@ begin
     begin
       str(handle,s);
       t:='/proc/self/fd/'+s+#0;
-      ttyname[0]:=char(fpreadlink(@t[1],@ttyname[1],255));
+      ttyname[0]:=AnsiChar(fpreadlink(@t[1],@ttyname[1],255));
     end;
 end;
 

+ 1 - 1
rtl/linux/termios.inc

@@ -3049,7 +3049,7 @@ Type
     c_oflag,
     c_cflag,
     c_lflag  : cardinal;
-    c_line   : char;
+    c_line   : AnsiChar;
     c_cc     : array[0..NCCS-1] of byte;
     c_ispeed,
     c_ospeed : cardinal;

+ 1 - 1
rtl/linux/unxsysc.inc

@@ -27,7 +27,7 @@ begin
 {$endif android}
 end;
 
-Function  fpStatFS  (Path:pchar; Info:pstatfs):cint;
+Function  fpStatFS  (Path:PAnsiChar; Info:pstatfs):cint;
 
 begin
 {$ifdef android}

+ 1 - 1
rtl/linux/unxsysch.inc

@@ -16,7 +16,7 @@
 function fpgettimeofday(tp: ptimeval;tzp:ptimezone):cint; external name 'FPC_SYSC_GETTIMEOFDAY';
 
 function  fpfStatFS (Fd: cint; Info:pstatfs):cint;
-function  fpStatFS  (Path:pchar; Info:pstatfs):cint;
+function  fpStatFS  (Path:PAnsiChar; Info:pstatfs):cint;
 function  fpfsync (fd : cint) : cint;
 Function  fpFlock   (fd,mode : cint)   : cint ;
 

+ 1 - 1
rtl/linux/x86_64/si_c.inc

@@ -37,7 +37,7 @@
 
 {$L abitag.o}
 var
-  libc_environ: pchar; external name '__environ';
+  libc_environ: PAnsiChar; external name '__environ';
   libc_fpu_control: word; external name '__fpu_control';
   libc_init_proc: procedure; external name '_init';
   libc_fini_proc: procedure; external name '_fini';

+ 1 - 1
rtl/linux/x86_64/si_g.inc

@@ -36,7 +36,7 @@
 {$asmmode gas}
 
 var
-  libc_environ: pchar; external name '__environ';
+  libc_environ: PAnsiChar; external name '__environ';
   libc_fpu_control: word; external name '__fpu_control';
   libc_init_proc: procedure; external name '_init';
   libc_fini_proc: procedure; external name '_fini';

+ 2 - 2
rtl/linux/xtensa/si_c.inc

@@ -25,13 +25,13 @@ var
   libc_init_proc: TProcedure; weakexternal name '_init';
   libc_fini_proc: TProcedure; weakexternal name '_fini';
 
-procedure libc_start_main(main: TProcedure; argc: ptruint; argv: ppchar; init, fini, rtld_fini: TProcedure; stack_end: pointer); cdecl; external name '__libc_start_main';
+procedure libc_start_main(main: TProcedure; argc: ptruint; argv: PPAnsiChar; init, fini, rtld_fini: TProcedure; stack_end: pointer); cdecl; external name '__libc_start_main';
 procedure libc_exit(code: ptruint); cdecl; external name 'exit';
 
 procedure _FPC_xtensa_enter(at_exit: TProcedure; sp: pptruint);
   var
     argc: ptruint;
-    argv: ppchar;
+    argv: PPAnsiChar;
   begin
     argc:=sp[0];
     argv:=@sp[1];