Browse Source

* Char -> AnsiChar

Michael VAN CANNEYT 2 years ago
parent
commit
23411b36e0
6 changed files with 144 additions and 144 deletions
  1. 17 17
      rtl/morphos/doslibd.inc
  2. 90 90
      rtl/morphos/doslibf.inc
  3. 4 4
      rtl/morphos/execd.inc
  4. 17 17
      rtl/morphos/execf.inc
  5. 7 7
      rtl/morphos/system.pp
  6. 9 9
      rtl/morphos/utilf.inc

+ 17 - 17
rtl/morphos/doslibd.inc

@@ -72,18 +72,18 @@ type
   TFileInfoBlock = packed record
     fib_DiskKey     : LongInt;
     fib_DirEntryType: LongInt;
-    fib_FileName    : Array[0..107] Of Char;
+    fib_FileName    : Array[0..107] Of AnsiChar;
     fib_Protection  : LongInt;
     fib_EntryType   : LongInt;
     fib_Size        : LongInt;
     fib_NumBlocks   : LongInt;
     fib_Date        : TDateStamp;
-    fib_Comment     : Array[0..79] Of Char;
+    fib_Comment     : Array[0..79] Of AnsiChar;
 
     fib_OwnerUID    : Word;
     fib_OwnerGID    : Word;
 
-    fib_Reserved    : Array[0..31] Of Char;
+    fib_Reserved    : Array[0..31] Of AnsiChar;
   end;
 
 const
@@ -326,7 +326,7 @@ type
     pr_Flags         : LongInt;
     pr_ExitCode      : Pointer;  { Procedure }
     pr_ExitData      : LongInt;
-    pr_Arguments     : PChar;
+    pr_Arguments     : PAnsiChar;
     pr_LocalVars     : TMinList;
     pr_ShellPrivate  : DWord;
     pr_CES           : DWord;    { BPTR }
@@ -652,7 +652,7 @@ type
          end;
        );
     2: ( dol_assign : record
-           dol_AssignName: PChar;
+           dol_AssignName: PAnsiChar;
            dol_List      : PAssignList;
          end;
        );
@@ -764,7 +764,7 @@ type
     an_Lock  : DWord;   { BPTR }
     an_Info  : TFileInfoBlock;
     an_Flags : ShortInt;
-    an_String: Array[0..0] Of Char;
+    an_String: Array[0..0] Of AnsiChar;
     { * an_String continues * }
   end;
 
@@ -783,7 +783,7 @@ type
           ap_Reserved  : ShortInt;
           ap_Strlen    : SmallInt;
           ap_Info      : TFileInfoBlock;
-          ap_Buf       : Array[0..0] of Char;
+          ap_Buf       : Array[0..0] of AnsiChar;
           { * an_Buf continues * }
         );
   end;
@@ -966,14 +966,14 @@ type
   PExAllData = ^TExAllData;
   TExAllData = packed record
     ed_Next    : PExAllData;
-    ed_Name    : PChar;
+    ed_Name    : PAnsiChar;
     ed_Type    : LongInt;
     ed_Size    : Cardinal;
     ed_Prot    : Cardinal;
     ed_Days    : Cardinal;
     ed_Mins    : Cardinal;
     ed_Ticks   : Cardinal;
-    ed_Comment : PChar;
+    ed_Comment : PAnsiChar;
     ed_OwnerUID: Word;
     ed_OwnerGID: Word;
   end;
@@ -983,7 +983,7 @@ type
   TexAllControl = packed record
     eac_Entries    : Cardinal;
     eac_LastKey    : Cardinal;
-    eac_MatchString: PChar;
+    eac_MatchString: PAnsiChar;
     eac_MatchFunc  : PHook;
 
   end;
@@ -1125,7 +1125,7 @@ type
   TLocalVar = packed record
     lv_Node : TNode;
     lv_Flags: Word;
-    lv_Value: PChar;
+    lv_Value: PAnsiChar;
     lv_Len  : Cardinal;
   end;
 
@@ -1163,7 +1163,7 @@ const
 type
   PCSource = ^TCSource;
   TCSource = packed record
-    CS_Buffer: PChar;
+    CS_Buffer: PAnsiChar;
     CS_Length: LongInt;
     CS_CurChr: LongInt;
   end;
@@ -1173,9 +1173,9 @@ type
   TRDArgs = packed record
     RDA_Source : TCSource;
     RDA_DAList : LongInt;
-    RDA_Buffer : PChar;
+    RDA_Buffer : PAnsiChar;
     RDA_BufSiz : LongInt;
-    RDA_ExtHelp: PChar;
+    RDA_ExtHelp: PAnsiChar;
     RDA_Flags  : LongInt;
   end;
 
@@ -1291,8 +1291,8 @@ const
 type
   PNotifyRequest = ^TNotifyRequest;
   TNotifyRequest = packed record
-    nr_Name    : PChar;
-    nr_FullName: PChar;
+    nr_Name    : PAnsiChar;
+    nr_FullName: PAnsiChar;
     nr_UserData: Cardinal;
     nr_Flags   : Cardinal;
     nr_stuff : record
@@ -1372,7 +1372,7 @@ type
   PSegNode = ^TSegNode;
   TSegNode = packed record
     seg_Node : TMinNode;
-    seg_Name : PChar;
+    seg_Name : PAnsiChar;
     seg_Array: Array[0..0] Of TSegArray;
   end;
 

+ 90 - 90
rtl/morphos/doslibf.inc

@@ -19,7 +19,7 @@
 
 { dos.library functions }
 
-function Open(fname     : PChar   location 'd1';
+function Open(fname     : PAnsiChar   location 'd1';
               accessMode: LongInt location 'd2'): LongInt;
 SysCall MOS_DOSBase 30;
 
@@ -47,14 +47,14 @@ function dosSeek(fileh   : LongInt location 'd1';
                  posmode : LongInt location 'd3'): LongInt;
 SysCall MOS_DOSBase 66;
 
-function dosDeleteFile(fname: PChar location 'd1'): LongBool;
+function dosDeleteFile(fname: PAnsiChar location 'd1'): LongBool;
 SysCall MOS_DOSBase 72;
 
-function dosRename(oldName: PChar location 'd1';
-                   newName: PChar location 'd2'): LongInt;
+function dosRename(oldName: PAnsiChar location 'd1';
+                   newName: PAnsiChar location 'd2'): LongInt;
 SysCall MOS_DOSBase 78;
 
-function Lock(lname     : PChar   location 'd1';
+function Lock(lname     : PAnsiChar   location 'd1';
               accessMode: LongInt location 'd2'): LongInt;
 SysCall MOS_DOSBase 84;
 
@@ -76,7 +76,7 @@ function Info(lock          : LongInt   location 'd1';
               parameterBlock: PInfoData location 'd2'): LongInt;
 SysCall MOS_DOSBase 114;
 
-function dosCreateDir(dname: PChar location 'd1'): LongInt;
+function dosCreateDir(dname: PAnsiChar location 'd1'): LongInt;
 SysCall MOS_DOSBase 120;
 
 function CurrentDir(lock: LongInt location 'd1'): LongInt;
@@ -85,7 +85,7 @@ SysCall MOS_DOSBase 126;
 function IoErr: LongInt;
 SysCall MOS_DOSBase 132;
 
-function CreateProc(name     : PChar   location 'd1';
+function CreateProc(name     : PAnsiChar   location 'd1';
                     pri      : LongInt location 'd2';
                     segList  : LongInt location 'd3';
                     stackSize: LongInt location 'd4'): PMsgPort;
@@ -94,20 +94,20 @@ SysCall MOS_DOSBase 138;
 procedure dosExit(returnCode: LongInt location 'd1');
 SysCall MOS_DOSBase 144;
 
-function LoadSeg(name: PChar location 'd1'): LongInt;
+function LoadSeg(name: PAnsiChar location 'd1'): LongInt;
 SysCall MOS_DOSBase 150;
 
 procedure UnLoadSeg(seglist: LongInt location 'd1');
 SysCall MOS_DOSBase 156;
 
-function DeviceProc(name: PChar location 'd1'): PMsgPort;
+function DeviceProc(name: PAnsiChar location 'd1'): PMsgPort;
 SysCall MOS_DOSBase 174;
 
-function SetComment(name   : PChar location 'd1';
-                    comment: PChar location 'd2'): LongBool;
+function SetComment(name   : PAnsiChar location 'd1';
+                    comment: PAnsiChar location 'd2'): LongBool;
 SysCall MOS_DOSBase 180;
 
-function SetProtection(name: PChar   location 'd1';
+function SetProtection(name: PAnsiChar   location 'd1';
                        mask: LongInt location 'd2'): LongInt;
 SysCall MOS_DOSBase 186;
 
@@ -127,7 +127,7 @@ SysCall MOS_DOSBase 210;
 function IsInteractive(file1: LongInt location 'd1'): LongBool;
 SysCall MOS_DOSBase 216;
 
-function Execute(string1: PChar   location 'd1';
+function Execute(string1: PAnsiChar   location 'd1';
                  file1  : LongInt location 'd2';
                  file2  : LongInt location 'd3'): LongBool;
 SysCall MOS_DOSBase 222;
@@ -249,21 +249,21 @@ function FWrite(fh      : LongInt  location 'd1';
 SysCall MOS_DOSBase 330;
 
 function FGets(fh    : LongInt  location 'd1';
-               buf   : PChar    location 'd2';
-               buflen: Cardinal location 'd3'): PChar;
+               buf   : PAnsiChar    location 'd2';
+               buflen: Cardinal location 'd3'): PAnsiChar;
 SysCall MOS_DOSBase 336;
 
 function FPuts(fh : LongInt location 'd1';
-               str: PChar   location 'd2'): LongInt;
+               str: PAnsiChar   location 'd2'): LongInt;
 SysCall MOS_DOSBase 342;
 
 procedure VFWritef(fh      : LongInt location 'd1';
-                   format  : PChar   location 'd2';
+                   format  : PAnsiChar   location 'd2';
                    argarray: Pointer location 'd3');
 SysCall MOS_DOSBase 348;
 
 function VFPrintf(fh      : LongInt location 'd1';
-                  format  : PChar   location 'd2';
+                  format  : PAnsiChar   location 'd2';
                   argarray: Pointer location 'd3'): LongInt;
 SysCall MOS_DOSBase 354;
 
@@ -271,7 +271,7 @@ function dosFlush(fh: LongInt location 'd1'): LongInt;
 SysCall MOS_DOSBase 360;
 
 function SetVBuf(fh   : LongInt location 'd1';
-                 buff : PChar   location 'd2';
+                 buff : PAnsiChar   location 'd2';
                  type1: LongInt location 'd3';
                  size : LongInt location 'd4'): LongInt;
 SysCall MOS_DOSBase 366;
@@ -289,23 +289,23 @@ function ExamineFH(fh : LongInt        location 'd1';
                    fib: PFileInfoBlock location 'd2'): LongBool;
 SysCall MOS_DOSBase 390;
 
-function SetFileDate(name: PChar      location 'd1';
+function SetFileDate(name: PAnsiChar      location 'd1';
                      date: PDateStamp location 'd2'): LongBool;
 SysCall MOS_DOSBase 396;
 
 function NameFromLock(lock  : LongInt location 'd1';
-                      buffer: PChar   location 'd2';
+                      buffer: PAnsiChar   location 'd2';
                       len   : LongInt location 'd3'): LongBool;
 SysCall MOS_DOSBase 402;
 
 function NameFromFH(fh    : LongInt location 'd1';
-                    buffer: PChar   location 'd2';
+                    buffer: PAnsiChar   location 'd2';
                     len   : LongInt location 'd3'): LongBool;
 SysCall MOS_DOSBase 408;
 
-function SplitName(name     : PChar    location 'd1';
+function SplitName(name     : PAnsiChar    location 'd1';
                    separator: Cardinal location 'd2';
-                   buf      : PChar    location 'd3';
+                   buf      : PAnsiChar    location 'd3';
                    oldpos   : LongInt  location 'd4';
                    size     : LongInt  location 'd5'): SmallInt;
 SysCall MOS_DOSBase 414;
@@ -327,12 +327,12 @@ SysCall MOS_DOSBase 432;
 
 function ReadLink(port  : PMsgPort location 'd1';
                   lock  : LongInt  location 'd2';
-                  path  : PChar    location 'd3';
-                  buffer: PChar    location 'd4';
+                  path  : PAnsiChar    location 'd3';
+                  buffer: PAnsiChar    location 'd4';
                   size  : Cardinal location 'd5'): LongBool;
 SysCall MOS_DOSBase 438;
 
-function MakeLink(name: PChar   location 'd1';
+function MakeLink(name: PAnsiChar   location 'd1';
                   dest: LongInt location 'd2';
                   soft: LongInt location 'd3'): LongBool;
 SysCall MOS_DOSBase 444;
@@ -351,13 +351,13 @@ function SetIoErr(result: LongInt location 'd1'): LongInt;
 SysCall MOS_DOSBase 462;
 
 function Fault(code  : LongInt location 'd1';
-               header: PChar   location 'd2';
-               buffer: PChar   location 'd3';
+               header: PAnsiChar   location 'd2';
+               buffer: PAnsiChar   location 'd3';
                len   : LongInt location 'd4'): LongBool;
 SysCall MOS_DOSBase 468;
 
 function PrintFault(code  : LongInt location 'd1';
-                    header: PChar   location 'd2'): LongBool;
+                    header: PAnsiChar   location 'd2'): LongBool;
 SysCall MOS_DOSBase 474;
 
 function ErrorReport(code  : LongInt  location 'd1';
@@ -377,7 +377,7 @@ SysCall MOS_DOSBase 498;
 
 function RunCommand(seg     : LongInt location 'd1';
                     stack   : LongInt location 'd2';
-                    paramptr: PChar   location 'd3';
+                    paramptr: PAnsiChar   location 'd3';
                     paramlen: LongInt location 'd4'): LongInt;
 SysCall MOS_DOSBase 504;
 
@@ -393,10 +393,10 @@ SysCall MOS_DOSBase 522;
 function SetFileSysTask(task: PMsgPort location 'd1'): PMsgPort;
 SysCall MOS_DOSBase 528;
 
-function GetArgStr: PChar;
+function GetArgStr: PAnsiChar;
 SysCall MOS_DOSBase 534;
 
-function SetArgStr(str: PChar location 'd1'): LongBool;
+function SetArgStr(str: PAnsiChar location 'd1'): LongBool;
 SysCall MOS_DOSBase 540;
 
 function FindCliProc(num: Cardinal location 'd1'): PProcess;
@@ -405,24 +405,24 @@ SysCall MOS_DOSBase 546;
 function MaxCli: Cardinal;
 SysCall MOS_DOSBase 552;
 
-function SetCurrentDirName(name: PChar location 'd1'): LongBool;
+function SetCurrentDirName(name: PAnsiChar location 'd1'): LongBool;
 SysCall MOS_DOSBase 558;
 
-function GetCurrentDirName(buf: PChar   location 'd1';
+function GetCurrentDirName(buf: PAnsiChar   location 'd1';
                            len: LongInt location 'd2'): LongBool;
 SysCall MOS_DOSBase 564;
 
-function SetProgramName(name: PChar location 'd1'): LongBool;
+function SetProgramName(name: PAnsiChar location 'd1'): LongBool;
 SysCall MOS_DOSBase 570;
 
-function GetProgramName(buf: PChar   location 'd1';
+function GetProgramName(buf: PAnsiChar   location 'd1';
                         len: LongInt location 'd2'): LongBool;
 SysCall MOS_DOSBase 576;
 
-function SetPrompt(name: PChar location 'd1'): LongBool;
+function SetPrompt(name: PAnsiChar location 'd1'): LongBool;
 SysCall MOS_DOSBase 582;
 
-function GetPrompt(buf: PChar   location 'd1';
+function GetPrompt(buf: PAnsiChar   location 'd1';
                    len: LongInt location 'd2'): LongBool;
 SysCall MOS_DOSBase 588;
 
@@ -432,35 +432,35 @@ SysCall MOS_DOSBase 594;
 function GetProgramDir: LongInt;
 SysCall MOS_DOSBase 600;
 
-function SystemTagList(command: PChar    location 'd1';
+function SystemTagList(command: PAnsiChar    location 'd1';
                        tags   : PTagItem location 'd2'): LongInt;
 SysCall MOS_DOSBase 606;
 
-function dosSystem(command: PChar    location 'd1';
+function dosSystem(command: PAnsiChar    location 'd1';
                    tags   : PTagItem location 'd2'): LongInt;
 SysCall MOS_DOSBase 606;
 
-function AssignLock(name: PChar   location 'd1';
+function AssignLock(name: PAnsiChar   location 'd1';
                     lock: LongInt location 'd2'): LongBool;
 SysCall MOS_DOSBase 612;
 
-function AssignLate(name: PChar location 'd1';
-                    path: PChar location 'd2'): LongBool;
+function AssignLate(name: PAnsiChar location 'd1';
+                    path: PAnsiChar location 'd2'): LongBool;
 SysCall MOS_DOSBase 618;
 
-function AssignPath(name: PChar location 'd1';
-                    path: PChar location 'd2'): LongBool;
+function AssignPath(name: PAnsiChar location 'd1';
+                    path: PAnsiChar location 'd2'): LongBool;
 SysCall MOS_DOSBase 624;
 
-function AssignAdd(name: PChar   location 'd1';
+function AssignAdd(name: PAnsiChar   location 'd1';
                    lock: LongInt location 'd2'): LongBool;
 SysCall MOS_DOSBase 630;
 
-function RemAssignList(name: PChar   location 'd1';
+function RemAssignList(name: PAnsiChar   location 'd1';
                        lock: LongInt location 'd2'): LongBool;
 SysCall MOS_DOSBase 636;
 
-function GetDeviceProc(name: PChar    location 'd1';
+function GetDeviceProc(name: PAnsiChar    location 'd1';
                        dp  : PDevProc location 'd2'): PDevProc;
 SysCall MOS_DOSBase 642;
 
@@ -483,7 +483,7 @@ function AddDosEntry(dlist: PDosList location 'd1'): LongInt;
 SysCall MOS_DOSBase 678;
 
 function FindDosEntry(dlist: PDosList location 'd1';
-                      name : PChar    location 'd2';
+                      name : PAnsiChar    location 'd2';
                       flags: Cardinal location 'd3'): PDosList;
 SysCall MOS_DOSBase 684;
 
@@ -491,30 +491,30 @@ function NextDosEntry(dlist: PDosList location 'd1';
                       flags: Cardinal location 'd2'): PDosList;
 SysCall MOS_DOSBase 690;
 
-function MakeDosEntry(name : PChar   location 'd1';
+function MakeDosEntry(name : PAnsiChar   location 'd1';
                       type1: LongInt location 'd2'): PDosList;
 SysCall MOS_DOSBase 696;
 
 procedure FreeDosEntry(dlist: PDosList location 'd1');
 SysCall MOS_DOSBase 702;
 
-function IsFileSystem(name: PChar location 'd1'): LongBool;
+function IsFileSystem(name: PAnsiChar location 'd1'): LongBool;
 SysCall MOS_DOSBase 708;
 
-function Format(filesystem: PChar    location 'd1';
-                volumename: PChar    location 'd2';
+function Format(filesystem: PAnsiChar    location 'd1';
+                volumename: PAnsiChar    location 'd2';
                 dostype   : Cardinal location 'd3'): LongBool;
 SysCall MOS_DOSBase 714;
 
-function Relabel(drive  : PChar location 'd1';
-                 newname: PChar location 'd2'): LongBool;
+function Relabel(drive  : PAnsiChar location 'd1';
+                 newname: PAnsiChar location 'd2'): LongBool;
 SysCall MOS_DOSBase 720;
 
-function Inhibit(name : PChar   location 'd1';
+function Inhibit(name : PAnsiChar   location 'd1';
                  onoff: LongInt location 'd2'): LongBool;
 SysCall MOS_DOSBase 726;
 
-function AddBuffers(name  : PChar   location 'd1';
+function AddBuffers(name  : PAnsiChar   location 'd1';
                     number: LongInt location 'd2'): LongBool;
 SysCall MOS_DOSBase 732;
 
@@ -534,20 +534,20 @@ function InternalLoadSeg(fh           : LongInt location 'd0';
                          var stack    : LongInt location 'a2'): LongInt;
 SysCall MOS_DOSBase 756;
 
-function NewLoadSeg(file1: PChar    location 'd1';
+function NewLoadSeg(file1: PAnsiChar    location 'd1';
                     tags : PTagItem location 'd2'): LongInt;
 SysCall MOS_DOSBase 768;
 
-function NewLoadSegTagList(file1: PChar    location 'd1';
+function NewLoadSegTagList(file1: PAnsiChar    location 'd1';
                            tags : PTagItem location 'd2'): LongInt;
 SysCall MOS_DOSBase 768;
 
-function AddSegment(name  : PChar   location 'd1';
+function AddSegment(name  : PAnsiChar   location 'd1';
                     seg   : LongInt location 'd2';
                     system: LongInt location 'd3'): LongBool;
 SysCall MOS_DOSBase 774;
 
-function FindSegment(name  : PChar    location 'd1';
+function FindSegment(name  : PAnsiChar    location 'd1';
                      seg   : PSegment location 'd2';
                      system: LongInt  location 'd3'): PSegment;
 SysCall MOS_DOSBase 780;
@@ -558,25 +558,25 @@ SysCall MOS_DOSBase 786;
 function CheckSignal(mask: LongInt location 'd1'): LongInt;
 SysCall MOS_DOSBase 792;
 
-function ReadArgs(arg_template: PChar   location 'd1';
+function ReadArgs(arg_template: PAnsiChar   location 'd1';
                   var array1  : LongInt location 'd2';
                   args        : PRDArgs location 'd3'): PRDArgs;
 SysCall MOS_DOSBase 798;
 
-function FindArg(keyword     : PChar location 'd1';
-                 arg_template: PChar location 'd2'): LongInt;
+function FindArg(keyword     : PAnsiChar location 'd1';
+                 arg_template: PAnsiChar location 'd2'): LongInt;
 SysCall MOS_DOSBase 804;
 
-function ReadItem(name    : PChar    location 'd1';
+function ReadItem(name    : PAnsiChar    location 'd1';
                   maxchars: LongInt  location 'd2';
                   cSource : PCSource location 'd3'): LongInt;
 SysCall MOS_DOSBase 810;
 
-function StrToLong(string1  : PChar   location 'd1';
+function StrToLong(string1  : PAnsiChar   location 'd1';
                    var value: LongInt location 'd2'): LongInt;
 SysCall MOS_DOSBase 816;
 
-function MatchFirst(pat   : PChar       location 'd1';
+function MatchFirst(pat   : PAnsiChar       location 'd1';
                     anchor: PAnchorPath location 'd2'): LongInt;
 SysCall MOS_DOSBase 822;
 
@@ -586,26 +586,26 @@ SysCall MOS_DOSBase 828;
 procedure MatchEnd(anchor: PAnchorPath location 'd1');
 SysCall MOS_DOSBase 834;
 
-function ParsePattern(pat   : PChar   location 'd1';
-                      buf   : PChar   location 'd2';
+function ParsePattern(pat   : PAnsiChar   location 'd1';
+                      buf   : PAnsiChar   location 'd2';
                       buflen: LongInt location 'd3'): LongInt;
 SysCall MOS_DOSBase 840;
 
-function MatchPattern(pat: PChar location 'd1';
-                      str: PChar location 'd2'): LongBool;
+function MatchPattern(pat: PAnsiChar location 'd1';
+                      str: PAnsiChar location 'd2'): LongBool;
 SysCall MOS_DOSBase 846;
 
 procedure FreeArgs(args: pRDArgs location 'd1');
 SysCall MOS_DOSBase 858;
 
-function FilePart(path: PChar location 'd1'): PChar;
+function FilePart(path: PAnsiChar location 'd1'): PAnsiChar;
 SysCall MOS_DOSBase 870;
 
-function PathPart(path: PChar location 'd1'): PChar;
+function PathPart(path: PAnsiChar location 'd1'): PAnsiChar;
 SysCall MOS_DOSBase 876;
 
-function AddPart(dirname: PChar    location 'd1';
-                filename: PChar    location 'd2';
+function AddPart(dirname: PAnsiChar    location 'd1';
+                filename: PAnsiChar    location 'd2';
                 size    : Cardinal location 'd3'): LongBool;
 SysCall MOS_DOSBase 882;
 
@@ -615,23 +615,23 @@ SysCall MOS_DOSBase 888;
 procedure EndNotify(notify: PNotifyRequest location 'd1');
 SysCall MOS_DOSBase 894;
 
-function SetVar(name  : PChar   location 'd1';
-                buffer: PChar   location 'd2';
+function SetVar(name  : PAnsiChar   location 'd1';
+                buffer: PAnsiChar   location 'd2';
                 size  : LongInt location 'd3';
                 flags : LongInt location 'd4'): LongBool;
 SysCall MOS_DOSBase 900;
 
-function GetVar(name  : PChar   location 'd1';
-                buffer: PChar   location 'd2';
+function GetVar(name  : PAnsiChar   location 'd1';
+                buffer: PAnsiChar   location 'd2';
                 size  : LongInt location 'd3';
                 flags : LongInt location 'd4'): LongInt;
 SysCall MOS_DOSBase 906;
 
-function DeleteVar(name : PChar    location 'd1';
+function DeleteVar(name : PAnsiChar    location 'd1';
                    flags: Cardinal location 'd2'): LongBool;
 SysCall MOS_DOSBase 912;
 
-function FindVar(name : PChar    location 'd1';
+function FindVar(name : PAnsiChar    location 'd1';
                  type1: Cardinal location 'd2'): PLocalVar;
 SysCall MOS_DOSBase 918;
 
@@ -641,24 +641,24 @@ SysCall MOS_DOSBase 930;
 function CliInitRun(dp: PDosPacket location 'a0'): LongInt;
 SysCall MOS_DOSBase 936;
 
-function WriteChars(buf   : PChar    location 'd1';
+function WriteChars(buf   : PAnsiChar    location 'd1';
                     buflen: Cardinal location 'd2'): LongInt;
 SysCall MOS_DOSBase 942;
 
-function PutStr(str: PChar location 'd1'): LongInt;
+function PutStr(str: PAnsiChar location 'd1'): LongInt;
 SysCall MOS_DOSBase 948;
 
-function VPrintf(format  : PChar   location 'd1';
+function VPrintf(format  : PAnsiChar   location 'd1';
                  argarray: Pointer location 'd2'): LongInt;
 SysCall MOS_DOSBase 954;
 
-function ParsePatternNoCase(pat   : PChar   location 'd1';
-                            buf   : PChar   location 'd2';
+function ParsePatternNoCase(pat   : PAnsiChar   location 'd1';
+                            buf   : PAnsiChar   location 'd2';
                             buflen: LongInt location 'd3'): LongInt;
 SysCall MOS_DOSBase 966;
 
-function MatchPatternNoCase(pat: PChar location 'd1';
-                            str: PChar location 'd2'): LongBool;
+function MatchPatternNoCase(pat: PAnsiChar location 'd1';
+                            str: PAnsiChar location 'd2'): LongBool;
 SysCall MOS_DOSBase 972;
 
 function SameDevice(lock1: LongInt location 'd1';
@@ -672,7 +672,7 @@ procedure ExAllEnd(lock   : LongInt       location 'd1';
                    control: PExAllControl location 'd5');
 SysCall MOS_DOSBase 990;
 
-function SetOwner(name      : PChar   location 'd1';
+function SetOwner(name      : PAnsiChar   location 'd1';
                   owner_info: LongInt location 'd2'): LongBool;
 SysCall MOS_DOSBase 996;
 

+ 4 - 4
rtl/morphos/execd.inc

@@ -32,7 +32,7 @@ type
     ln_Pred: PNode;
     ln_Type: Byte;
     ln_Pri : ShortInt;
-    ln_Name: PChar;
+    ln_Name: PAnsiChar;
   end;
 
 type
@@ -431,8 +431,8 @@ type
     rt_Version  : Byte;
     rt_Type     : Byte;
     rt_Pri      : Byte;
-    rt_Name     : PChar;
-    rt_IdString : PChar;
+    rt_Name     : PAnsiChar;
+    rt_IdString : PAnsiChar;
     rt_Init     : Pointer;
     { * Only valid when RTF_EXTENDED is set
       * }
@@ -1088,7 +1088,7 @@ type
     lib_PosSize : Word;
     lib_Version : Word;
     lib_Revision: Word;
-    lib_IdString: PChar;
+    lib_IdString: PAnsiChar;
     lib_Sum     : DWord;
     lib_OpenCnt : Word;
   end;

+ 17 - 17
rtl/morphos/execf.inc

@@ -40,7 +40,7 @@ procedure MakeFunctions(target       : Pointer location 'a0';
                         funcDispBase : Pointer location 'a2');
 SysCall MOS_ExecBase 090;
 
-function FindResident(name: PChar location 'a1'): PResident;
+function FindResident(name: PAnsiChar location 'a1'): PResident;
 SysCall MOS_ExecBase 096;
 
 function InitResident(resident: PResident location 'a1';
@@ -150,7 +150,7 @@ procedure Enqueue(list: PList location 'a0';
 SysCall MOS_ExecBase 270;
 
 function FindName(list: PList location 'a0';
-                  name: PChar location 'a1'): PNode;
+                  name: PAnsiChar location 'a1'): PNode;
 SysCall MOS_ExecBase 276;
 
 function AddTask(task   : PTask   location 'a1';
@@ -161,7 +161,7 @@ SysCall MOS_ExecBase 282;
 procedure RemTask(task: PTask location 'a1');
 SysCall MOS_ExecBase 288;
 
-function FindTask(name: PChar location 'a1'): PTask;
+function FindTask(name: PAnsiChar location 'a1'): PTask;
 SysCall MOS_ExecBase 294;
 
 function SetTaskPri(task    : PTask   location 'a1';
@@ -214,7 +214,7 @@ SysCall MOS_ExecBase 378;
 function WaitPort(port: PMsgPort location 'a0'): PMessage;
 SysCall MOS_ExecBase 384;
 
-function FindPort(name: PChar location 'a1'): PMsgPort;
+function FindPort(name: PAnsiChar location 'a1'): PMsgPort;
 SysCall MOS_ExecBase 390;
 
 procedure AddLibrary(libHandle: PLibrary location 'a1');
@@ -223,7 +223,7 @@ SysCall MOS_ExecBase 396;
 procedure RemLibrary(libHandle: PLibrary location 'a1');
 SysCall MOS_ExecBase 402;
 
-function OldOpenLibrary(libName: PChar location 'a1'): PLibrary;
+function OldOpenLibrary(libName: PAnsiChar location 'a1'): PLibrary;
 SysCall MOS_ExecBase 408;
 
 procedure CloseLibrary(libHandle: PLibrary location 'a1');
@@ -243,7 +243,7 @@ SysCall MOS_ExecBase 432;
 procedure RemDevice(device: PDevice location 'a1');
 SysCall MOS_ExecBase 438;
 
-function OpenDevice(devName  : PChar      location 'a0';
+function OpenDevice(devName  : PAnsiChar      location 'a0';
                     numunit  : Cardinal   location 'd0';
                     ioRequest: pIORequest location 'a1';
                     flags    : Cardinal   location 'd1'): ShortInt;
@@ -273,19 +273,19 @@ SysCall MOS_ExecBase 486;
 procedure RemResource(resource: Pointer location 'a1');
 SysCall MOS_ExecBase 492;
 
-function OpenResource(resName: PChar location 'a1'): Pointer;
+function OpenResource(resName: PAnsiChar location 'a1'): Pointer;
 SysCall MOS_ExecBase 498;
 
 procedure RawIOInit;
 SysCall MOS_ExecBase 504;
 
-function RawMayGetChar: Char;
+function RawMayGetChar: AnsiChar;
 SysCall MOS_ExecBase 510;
 
-procedure RawPutChar(d0arg: Char location 'd0');
+procedure RawPutChar(d0arg: AnsiChar location 'd0');
 SysCall MOS_ExecBase 516;
 
-function RawDoFmt(formatString: PChar   location 'a0';
+function RawDoFmt(formatString: PAnsiChar   location 'a0';
                   dataStream  : Pointer location 'a1';
                   putChProc   : Pointer location 'a2';
                   putChData   : Pointer location 'a3'): Pointer;
@@ -305,7 +305,7 @@ procedure Vacate(sigSem: PSignalSemaphore  location 'a0';
                  bidMsg: PSemaphoreMessage location 'a1');
 SysCall MOS_ExecBase 546;
 
-function OpenLibrary(libname: PChar    location 'a1';
+function OpenLibrary(libname: PAnsiChar    location 'a1';
                      libver : Cardinal location 'd0'): Pointer;
 SysCall MOS_ExecBase 552;
 
@@ -327,7 +327,7 @@ SysCall MOS_ExecBase 582;
 procedure ReleaseSemaphoreList(sigSem: PList location 'a0');
 SysCall MOS_ExecBase 588;
 
-function FindSemaphore(sigSem: PChar location 'a1'): PSignalSemaphore;
+function FindSemaphore(sigSem: PAnsiChar location 'a1'): PSignalSemaphore;
 SysCall MOS_ExecBase 594;
 
 procedure AddSemaphore(sigSem: PSignalSemaphore location 'a1');
@@ -343,7 +343,7 @@ procedure AddMemList(size      : Cardinal location 'd0';
                      attributes: Cardinal location 'd1';
                      pri       : LongInt  location 'd2';
                      base      : Pointer  location 'a0';
-                     name      : PChar    location 'a1');
+                     name      : PAnsiChar    location 'a1');
 SysCall MOS_ExecBase 618;
 
 procedure CopyMem(source: Pointer  location 'a0';
@@ -470,10 +470,10 @@ SysCall MOS_ExecBase 810;
 function ReadGayle: Cardinal;
 SysCall MOS_ExecBase 816;
 
-function VNewRawDoFmt(FmtString: PChar;
+function VNewRawDoFmt(FmtString: PAnsiChar;
                       PutChProc: Pointer;
-                      PutChData: PChar;
-                      args     : PChar): PChar;
+                      PutChData: PAnsiChar;
+                      args     : PAnsiChar): PAnsiChar;
 SysCall BaseSysV MOS_ExecBase 822;
 
 procedure CacheFlushDataArea(Address: Pointer  location 'a0';
@@ -559,7 +559,7 @@ procedure RemExecNotify(hook: PHook);
 SysCall BaseSysV MOS_ExecBase 954;
 
 function FindExecNode(ttype: Cardinal location 'd0';
-                      name : PChar    location 'a0'): PNode;
+                      name : PAnsiChar    location 'a0'): PNode;
 SysCall MOS_ExecBase 960;
 
 function AddExecNodeA(innode  : Pointer  location 'a0';

+ 7 - 7
rtl/morphos/system.pp

@@ -35,8 +35,8 @@ const
   DriveSeparator = ':';
   ExtensionSeparator = '.';
   PathSeparator = ';';
-  AllowDirectorySeparators : set of char = ['\','/'];
-  AllowDriveSeparators : set of char = [':'];
+  AllowDirectorySeparators : set of AnsiChar = ['\','/'];
+  AllowDriveSeparators : set of AnsiChar = [':'];
   maxExitCode = 255;
   MaxPathLen = 256;
   AllFilesMask = '#?';
@@ -67,13 +67,13 @@ var
   ASYS_fileSemaphore: Pointer; { mutex semaphore for filelist access arbitration }
   ASYS_origDir  : LongInt; { original directory on startup }
   MOS_ambMsg   : Pointer;
-  MOS_ConName  : PChar ='CON:10/30/620/100/FPC Console Output/AUTO/CLOSE/WAIT';
+  MOS_ConName  : PAnsiChar ='CON:10/30/620/100/FPC Console Output/AUTO/CLOSE/WAIT';
   MOS_ConHandle: LongInt;
   AOS_wbMsg: Pointer absolute MOS_ambMsg;  { common Amiga code compatibility kludge }
 
   argc: LongInt;
-  argv: PPChar;
-  envp: PPChar;
+  argv: PPAnsiChar;
+  envp: PPAnsiChar;
 
 
 implementation
@@ -102,7 +102,7 @@ type
   pWBArg = ^tWBArg;
   tWBArg = record
     wa_Lock: longint;
-    wa_Name: PChar;
+    wa_Name: PAnsiChar;
   end;
 
   WBArgList = array[1..MaxInt] of TWBArg; { Only 1..smNumArgs are valid }
@@ -114,7 +114,7 @@ type
     sm_Process   : pMsgPort;
     sm_Segment   : longint;
     sm_NumArgs   : longint;
-    sm_ToolWindow: PChar;
+    sm_ToolWindow: PAnsiChar;
     sm_ArgList   : PWBArgList;
   end;
 

+ 9 - 9
rtl/morphos/utilf.inc

@@ -97,19 +97,19 @@ function UDivMod32(dividend: Cardinal location 'd0';
                    divisor : Cardinal location 'd1'): Cardinal;
 SysCall MOS_UtilityBase 156;
 
-function Stricmp(string1: PChar location 'a0';
-                 string2: PChar location 'a1'): LongInt;
+function Stricmp(string1: PAnsiChar location 'a0';
+                 string2: PAnsiChar location 'a1'): LongInt;
 SysCall MOS_UtilityBase 162;
 
-function Strnicmp(string1: PChar   location 'a0';
-                  string2: PChar   location 'a1';
+function Strnicmp(string1: PAnsiChar   location 'a0';
+                  string2: PAnsiChar   location 'a1';
                   length : LongInt location 'd0'): LongInt;
 SysCall MOS_UtilityBase 168;
 
-function ToUpper(character: Cardinal location 'd0'): Char;
+function ToUpper(character: Cardinal location 'd0'): AnsiChar;
 SysCall MOS_UtilityBase 174;
 
-function ToLower(character: Cardinal location 'd0'): Char;
+function ToLower(character: Cardinal location 'd0'): AnsiChar;
 SysCall MOS_UtilityBase 180;
 
 procedure ApplyTagChanges(list      : PTagItem location 'a0';
@@ -138,7 +138,7 @@ function AddNamedObject(nameSpace: PNamedObject location 'a0';
                         nobject  : PNamedObject location 'a1'): LongBool;
 SysCall MOS_UtilityBase 222;
 
-function AllocNamedObjectA(name   : PChar    location 'a0';
+function AllocNamedObjectA(name   : PAnsiChar    location 'a0';
                            tagList: PTagItem location 'a1'): PNamedObject;
 SysCall MOS_UtilityBase 228;
 
@@ -146,14 +146,14 @@ function AttemptRemNamedObject(nobject: PNamedObject location 'a0'): LongInt;
 SysCall MOS_UtilityBase 234;
 
 function FindNamedObject(nameSpace : PNamedObject location 'a0';
-                         name      : PChar        location 'a1';
+                         name      : PAnsiChar        location 'a1';
                          lastObject: PNamedObject location 'a2'): PNamedObject;
 SysCall MOS_UtilityBase 240;
 
 procedure FreeNamedObject(nobject: PNamedObject location 'a0');
 SysCall MOS_UtilityBase 246;
 
-function NamedObjectName(nobject: PNamedObject location 'a0'): PChar;
+function NamedObjectName(nobject: PNamedObject location 'a0'): PAnsiChar;
 SysCall MOS_UtilityBase 252;
 
 procedure ReleaseNamedObject(nobject: pNamedObject location 'a0');