* Char -> AnsiChar

rtl/watcom/dos.pp

@@ -185,7 +185,7 @@ var
 
   function paste_to_dos(src : string) : boolean;
   var
-    c : array[0..255] of char;
+    c : array[0..255] of AnsiChar;
   begin
      paste_to_dos:=false;
      if current_dos_buffer_pos+length(src)+1>tb+tb_size then
@@ -201,7 +201,7 @@ begin
 { create command line }
   move(comline[0],c[1],length(comline)+1);
   c[length(comline)+2]:=#13;
-  c[0]:=char(length(comline)+2);
+  c[0]:=AnsiChar(length(comline)+2);
 { create path }
   p:=path;
   DoDirSeparators(p);
@@ -452,7 +452,7 @@ begin
 end;
 
 
-procedure LFNFindFirst(path:pchar;attr:longint;var s:searchrec);
+procedure LFNFindFirst(path:PAnsiChar;attr:longint;var s:searchrec);
 var
   i : longint;
   w : LFNSearchRec;
@@ -532,7 +532,7 @@ begin
 end;
 
 
-procedure DosFindfirst(path : pchar;attr : word;var f : searchrec);
+procedure DosFindfirst(path : PAnsiChar;attr : word;var f : searchrec);
 var
    i : longint;
 begin
@@ -576,7 +576,7 @@ end;
 
 procedure findfirst(const path : pathstr;attr : word;var f : searchRec);
 var
-  path0 : array[0..256] of char;
+  path0 : array[0..256] of AnsiChar;
 begin
   doserror:=0;
   strpcopy(path0,path);
@@ -680,7 +680,7 @@ end;
 { change to short filename if successful DOS call PM }
 function GetShortName(var p : String) : boolean;
 var
-  c : array[0..255] of char;
+  c : array[0..255] of AnsiChar;
 begin
   move(p[1],c[0],length(p));
   c[length(p)]:=#0;
@@ -697,7 +697,7 @@ begin
    begin
      copyfromdos(c,255);
      move(c[0],p[1],strlen(c));
-     p[0]:=char(strlen(c));
+     p[0]:=AnsiChar(strlen(c));
      GetShortName:=true;
    end
   else
@@ -708,7 +708,7 @@ end;
 { change to long filename if successful DOS call PM }
 function GetLongName(var p : String) : boolean;
 var
-  c : array[0..255] of char;
+  c : array[0..255] of AnsiChar;
 begin
   move(p[1],c[0],length(p));
   c[length(p)]:=#0;
@@ -725,7 +725,7 @@ begin
    begin
      copyfromdos(c,255);
      move(c[0],p[1],strlen(c));
-     p[0]:=char(strlen(c));
+     p[0]:=AnsiChar(strlen(c));
      GetLongName:=true;
    end
   else
@@ -800,7 +800,7 @@ end;
 
 function envcount : longint;
 var
-  hp : ppchar;
+  hp : PPAnsiChar;
 begin
   hp:=envp;
   envcount:=0;
@@ -819,13 +819,13 @@ begin
      envstr:='';
      exit;
    end;
-  envstr:=strpas(ppchar(pointer(envp)+4*(index-1))^);
+  envstr:=strpas(PPAnsiChar(pointer(envp)+4*(index-1))^);
 end;
 
 
 Function  GetEnv(envvar: string): string;
 var
-  hp      : ppchar;
+  hp      : PPAnsiChar;
   hs    : string;
   eqpos : longint;
 begin

rtl/watcom/sysdir.inc

@@ -4,7 +4,7 @@
 
 procedure DosDir(func:byte;s:rawbytestring);
 var
-  buffer : array[0..255] of char;
+  buffer : array[0..255] of AnsiChar;
   regs   : trealregs;
 begin
   DoDirSeparators(s);
@@ -80,7 +80,7 @@ end;
 
 procedure do_getdir(drivenr : byte;var dir : RawByteString);
 var
-  temp : array[0..255] of char;
+  temp : array[0..255] of AnsiChar;
   i    : longint;
   regs : trealregs;
 begin
@@ -95,7 +95,7 @@ begin
   if (regs.realflags and carryflag) <> 0 then
    Begin
      GetInOutRes(lo(regs.realeax));
-     Dir := char (DriveNr + 64) + ':\';
+     Dir := AnsiChar (DriveNr + 64) + ':\';
      SetCodePage(dir,DefaultFileSystemCodePage,false);
      exit;
    end
@@ -119,7 +119,7 @@ begin
   if not FileNameCasePreserving then
    dir:=upcase(dir);
   if drivenr<>0 then   { Drive was supplied. We know it }
-   dir[1]:=char(65+drivenr-1)
+   dir[1]:=AnsiChar(65+drivenr-1)
   else
    begin
    { We need to get the current drive from DOS function 19H  }

rtl/watcom/sysfile.inc

@@ -4,7 +4,7 @@
    var
       openfiles : array [0..max_files-1] of boolean;
 {$ifdef SYSTEMDEBUG}
-      opennames : array [0..max_files-1] of pchar;
+      opennames : array [0..max_files-1] of PAnsiChar;
    const
       free_closed_names : boolean = true;
 {$endif SYSTEMDEBUG}
@@ -37,10 +37,10 @@ begin
    GetInOutRes(lo(regs.realeax));
 end;
 
-procedure do_erase(p : pchar; pchangeable: boolean);
+procedure do_erase(p : PAnsiChar; pchangeable: boolean);
 var
   regs : trealregs;
-  oldp : pchar;
+  oldp : PAnsiChar;
 begin
   oldp:=p;
   DoDirSeparators(p,pchangeable);
@@ -60,10 +60,10 @@ begin
     freemem(p);
 end;
 
-procedure do_rename(p1,p2 : pchar; p1changeable, p2changeable: boolean);
+procedure do_rename(p1,p2 : PAnsiChar; p1changeable, p2changeable: boolean);
 var
   regs : trealregs;
-  oldp1, oldp2 : pchar;
+  oldp1, oldp2 : PAnsiChar;
 begin
   oldp1:=p1;
   oldp2:=p2;
@@ -271,7 +271,7 @@ begin
 end;
 
 
-procedure do_open(var f;p:pchar;flags:longint; pchangeable: boolean);
+procedure do_open(var f;p:PAnsiChar;flags:longint; pchangeable: boolean);
 {
   filerec and textrec have both handle and mode as the first items so
   they could use the same routine for opening/creating.
@@ -283,7 +283,7 @@ var
   regs   : trealregs;
   action : longint;
   Avoid6c00 : boolean;
-  oldp : pchar;
+  oldp : PAnsiChar;
 begin
 { check if Extended Open/Create API is safe to use }
   Avoid6c00 := lo(dos_version) < 7;

rtl/watcom/system.pp

@@ -39,8 +39,8 @@ const
  DriveSeparator = ':';
  ExtensionSeparator = '.';
  PathSeparator = ';';
- AllowDirectorySeparators : set of char = ['\','/'];
- AllowDriveSeparators : set of char = [':'];
+ AllowDirectorySeparators : set of AnsiChar = ['\','/'];
+ AllowDriveSeparators : set of AnsiChar = [':'];
 { FileNameCaseSensitive and FileNameCasePreserving are defined separately below!!! }
  maxExitCode = 255;
  MaxPathLen = 256;
@@ -72,9 +72,9 @@ var
   meml : array[0..($7fffffff div sizeof(longint)) -1] of longint absolute $0:$0;
 { C-compatible arguments and environment }
   argc  : longint;
-  argv  : ppchar;
-  envp  : ppchar;
-  dos_argv0 : pchar;
+  argv  : PPAnsiChar;
+  envp  : PPAnsiChar;
+  dos_argv0 : PAnsiChar;
 
   AllFilesMask: string [3];
 
@@ -130,16 +130,16 @@ var
   rm_argv  : ^arrayword;
   argv0len : longint;
   useproxy : boolean;
-  hp       : ppchar;
+  hp       : PPAnsiChar;
   doscmd   : string[129];  { Dos commandline copied from PSP, max is 128 chars +1 for terminating zero }
   arglen,
   count   : longint;
   argstart,
-  pc,arg  : pchar;
-  quote   : char;
+  pc,arg  : PAnsiChar;
+  quote   : AnsiChar;
   argvlen : longint;
 
-  function atohex(s : pchar) : longint;
+  function atohex(s : PAnsiChar) : longint;
   var
     rv : longint;
     v  : byte;
@@ -221,7 +221,7 @@ begin
             begin
               if quote<>'''' then
                begin
-                 if pchar(pc+1)^<>'"' then
+                 if PAnsiChar(pc+1)^<>'"' then
                   begin
                     if quote='"' then
                      quote:=' '
@@ -238,7 +238,7 @@ begin
             begin
               if quote<>'"' then
                begin
-                 if pchar(pc+1)^<>'''' then
+                 if PAnsiChar(pc+1)^<>'''' then
                   begin
                     if quote=''''  then
                      quote:=' '
@@ -278,7 +278,7 @@ begin
             begin
               if quote<>'''' then
                begin
-                 if pchar(pc+1)^<>'"' then
+                 if PAnsiChar(pc+1)^<>'"' then
                   begin
                     if quote='"' then
                      quote:=' '
@@ -298,7 +298,7 @@ begin
             begin
               if quote<>'"' then
                begin
-                 if pchar(pc+1)^<>'''' then
+                 if PAnsiChar(pc+1)^<>'''' then
                   begin
                     if quote=''''  then
                      quote:=' '
@@ -391,7 +391,7 @@ begin
   sysreallocmem(argv,(argc+1)*sizeof(pointer));
 end;
 
-function strcopy(dest,source : pchar) : pchar;assembler;
+function strcopy(dest,source : PAnsiChar) : PAnsiChar;assembler;
 var
   saveeax,saveesi,saveedi : longint;
 asm
@@ -473,7 +473,7 @@ var
 
 procedure setup_environment;
 var env_count : longint;
-    dos_env,cp : pchar;
+    dos_env,cp : PAnsiChar;
 begin
   env_count:=0;
   dos_env:=getmem(env_size);
@@ -485,7 +485,7 @@ begin
     while (cp^ <> #0) do inc(longint(cp)); { skip to NUL }
     inc(longint(cp)); { skip to next character }
     end;
-  envp := sysgetmem((env_count+1) * sizeof(pchar));
+  envp := sysgetmem((env_count+1) * sizeof(PAnsiChar));
   if (envp = nil) then exit;
   cp:=dos_env;
   env_count:=0;
@@ -703,7 +703,7 @@ end;
 function CheckLFN:boolean;
 var
   regs     : TRealRegs;
-  RootName : pchar;
+  RootName : PAnsiChar;
 begin
 { Check LFN API on drive c:\ }
   RootName:='C:\';

rtl/watcom/sysutils.pp

@@ -73,11 +73,11 @@ const
 Type
   PSearchrec = ^Searchrec;
 
-{  converts S to a pchar and copies it to the transfer-buffer.   }
+{  converts S to a PAnsiChar and copies it to the transfer-buffer.   }
 
 procedure StringToTB(const S: RawByteString);
 begin
-  { include terminating null char }
+  { include terminating null AnsiChar }
   SysCopyToDos(longint(pointer(s)), Length(S) + 1);
 end ;
 
@@ -662,7 +662,7 @@ end ;
 ****************************************************************************}
 
 const
-  BeepChars: array [1..2] of char = #7'$';
+  BeepChars: array [1..2] of AnsiChar = #7'$';
 
 procedure sysBeep;
 var

rtl/watcom/watcom.pp

@@ -104,7 +104,7 @@ interface
     procedure seg_move(sseg : word;source : longint;dseg : word;dest : longint;count : longint);
 
     { fills a memory area specified by a 48 bit pointer with c }
-    procedure seg_fillchar(seg : word;ofs : longint;count : longint;c : char);
+    procedure seg_fillchar(seg : word;ofs : longint;count : longint;c : AnsiChar);
     procedure seg_fillword(seg : word;ofs : longint;count : longint;w : word);
 
     {************************************}
@@ -157,7 +157,7 @@ interface
     procedure dpmi_dosmemput(seg : word;ofs : word;var data;count : longint);
     procedure dpmi_dosmemget(seg : word;ofs : word;var data;count : longint);
     procedure dpmi_dosmemmove(sseg,sofs,dseg,dofs : word;count : longint);
-    procedure dpmi_dosmemfillchar(seg,ofs : word;count : longint;c : char);
+    procedure dpmi_dosmemfillchar(seg,ofs : word;count : longint;c : AnsiChar);
     procedure dpmi_dosmemfillword(seg,ofs : word;count : longint;w : word);
 
 
@@ -169,7 +169,7 @@ interface
        dosmemput      : procedure(seg : word;ofs : word;var data;count : longint)=@dpmi_dosmemput;
        dosmemget      : procedure(seg : word;ofs : word;var data;count : longint)=@dpmi_dosmemget;
        dosmemmove     : procedure(sseg,sofs,dseg,dofs : word;count : longint)=@dpmi_dosmemmove;
-       dosmemfillchar : procedure(seg,ofs : word;count : longint;c : char)=@dpmi_dosmemfillchar;
+       dosmemfillchar : procedure(seg,ofs : word;count : longint;c : AnsiChar)=@dpmi_dosmemfillchar;
        dosmemfillword : procedure(seg,ofs : word;count : longint;w : word)=@dpmi_dosmemfillword;
 
   implementation
@@ -196,7 +196,7 @@ interface
          seg_move(dosmemselector,sseg*16+sofs,dosmemselector,dseg*16+dofs,count);
       end;
 
-    procedure dpmi_dosmemfillchar(seg,ofs : word;count : longint;c : char);
+    procedure dpmi_dosmemfillchar(seg,ofs : word;count : longint;c : AnsiChar);
 
       begin
          seg_fillchar(dosmemselector,seg*16+ofs,count,c);
@@ -287,7 +287,7 @@ interface
          end;
       end;
 
-    procedure seg_fillchar(seg : word;ofs : longint;count : longint;c : char);
+    procedure seg_fillchar(seg : word;ofs : longint;count : longint;c : AnsiChar);
 
       begin
          asm