* Char -> AnsiChar

rtl/darwin/console.pp

@@ -32,7 +32,7 @@ interface
 to longint because INT is a standard function in TP/FPC}
 
 TYPE
-     uchar = char;
+     uchar = AnsiChar;
      uint  = dword;
      u_int = uint;
      ushort= word;
@@ -323,7 +323,7 @@ const
 type  video_adapter  = record
                         va_index                : longint;
                         va_type                 : longint;
-                        va_name                 : pchar;
+                        va_name                 : PAnsiChar;
                         va_unit                 : longint;
                         va_minor                : longint;
                         va_flags                : longint;
@@ -355,7 +355,7 @@ type  video_adapter  = record
        video_adapter_info = record
                         va_index                : longint;
                         va_type                 : longint;
-                        va_name                 : array[0..15] of char;
+                        va_name                 : array[0..15] of AnsiChar;
                         va_unit                 : longint;
                         va_flags                : longint;
                         va_io_base              : longint;
@@ -614,7 +614,7 @@ type
 { get/set screen char map }
 
         scrmap   = record
-                    _scrmap : array[0..255] of char;
+                    _scrmap : array[0..255] of AnsiChar;
                     end;
         scrmap_t =  scrmap;
 
@@ -643,7 +643,7 @@ Function CONS_BLANKTIME(fd:longint;var param1 : longint):boolean;
 CONST        maxsaver=16;
 
 type ssaver =record
-                name : array[0..maxsaver-1] of char;
+                name : array[0..maxsaver-1] of AnsiChar;
                 num  : Longint;
                 time : Long;
                 end;
@@ -738,19 +738,19 @@ Function CONS_SAVERSTART(fd:longint;var param1 : longint):boolean;
 TYPE
 { set/get font data }
         fnt8        = record
-                        fnt8x8 : array[0..8*256-1] of char;
+                        fnt8x8 : array[0..8*256-1] of AnsiChar;
                       end;
 
         fnt8_t      = fnt8;
 
         fnt14       = record
-                        fnt8x14: array[0..14*256-1] of char;
+                        fnt8x14: array[0..14*256-1] of AnsiChar;
                       end;
 
         fnt14_t     = fnt14;
 
         fnt16       = record
-                        fnt8x16: array[0..16*256-1] of char;
+                        fnt8x16: array[0..16*256-1] of AnsiChar;
                        end;
         fnt16_t     = fnt16;
 
@@ -764,8 +764,8 @@ Function GIO_FONT8x16(fd:longint;var param1 : fnt16_t):boolean;
 
 { get video mode information }
 type        colors = record
-                       fore : char;
-                       back : char;
+                       fore : AnsiChar;
+                       back : AnsiChar;
                       end;
 
             vid_info = record
@@ -846,8 +846,8 @@ const
 
 TYPE
         vt_mode    = record
-                       mode     :   Char;
-                       waitv    :   char;    { not implemented yet  SOS }
+                       mode     :   AnsiChar;
+                       waitv    :   AnsiChar;    { not implemented yet  SOS }
                        relsig   :   short;
                        acqsig   :   short;
                        frsig    :   short;   { not implemented yet  SOS }
@@ -1060,7 +1060,7 @@ TYPE
 { get keyboard information}
   keyboard_info = Record
                         kb_index : longint;     { kbdio index#}
-                        kb_name  : array[0..15] of char;        { driver name}
+                        kb_name  : array[0..15] of AnsiChar;        { driver name}
                         kb_unit  : longint;     { unit#}
                         kb_type  : longint;     { KB_84, KB_101, KB_OTHER,...}
                         kb_config: longint;     { device configuration flags}
@@ -1203,8 +1203,8 @@ type acc_t           = record
 
              fkeyarg =record
                         keynum : ushort;
-                        keydef : array[0..MAXFK-1] of char;
-                        flen :char;
+                        keydef : array[0..MAXFK-1] of AnsiChar;
+                        flen :AnsiChar;
                         end;
 
          fkeyarg_t       = fkeyarg;

rtl/darwin/errnostr.inc

@@ -15,7 +15,7 @@
 
 const
   sys_errn=94;
-  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 }

rtl/darwin/extres_multiarch.inc

@@ -48,7 +48,7 @@ const
 
 type
   TExtHeader = packed record
-    magic : array[0..5] of char;//'FPCRES'
+    magic : array[0..5] of AnsiChar;//'FPCRES'
     version : byte;             //EXT_CURRENT_VERSION
     endianess : byte;           //EXT_ENDIAN_BIG or EXT_ENDIAN_LITTLE
     count : longword;           //resource count
@@ -86,10 +86,10 @@ var
 *****************************************************************************)
 
 //resource functions are case insensitive... copied from genstr.inc
-function ResStrIComp(Str1, Str2 : PChar): SizeInt;
+function ResStrIComp(Str1, Str2 : PAnsiChar): SizeInt;
 var
   counter: SizeInt;
-  c1, c2: char;
+  c1, c2: AnsiChar;
 begin
   counter := 0;
   c1 := upcase(str1[counter]);
@@ -105,8 +105,8 @@ begin
 end;
 
 {!fixme!}
-//function InternalIsIntResource(aStr : pchar; out aInt : PtrUint) : boolean;
-function InternalIsIntResource(aStr : pchar; var aInt : PtrUint) : boolean;
+//function InternalIsIntResource(aStr : PAnsiChar; out aInt : PtrUint) : boolean;
+function InternalIsIntResource(aStr : PAnsiChar; var aInt : PtrUint) : boolean;
 var i : integer;
     s : shortstring;
     code : word;
@@ -135,9 +135,9 @@ begin
   GetResInfoPtr:=PResInfoNode(PtrUInt(base)+offset);
 end;
 
-function GetPchar(base : PExtHeader; const offset : longword) : Pchar; inline;
+function GetPchar(base : PExtHeader; const offset : longword) : PAnsiChar; inline;
 begin
-  GetPchar:=Pchar(PtrUInt(base)+offset);
+  GetPchar:=PAnsiChar(PtrUInt(base)+offset);
 end;
 
 function GetPtr(base : PExtHeader; const offset : longword) : Pointer; inline;
@@ -195,7 +195,7 @@ begin
 //  writeln('base path is ',GetExtResBasePath);
 end;
 
-function GetExtResPathArch(const base : shortstring) : pchar;
+function GetExtResPathArch(const base : shortstring) : PAnsiChar;
 var len : integer;
 begin
   len:=byte(base[0]);
@@ -209,7 +209,7 @@ begin
 //  writeln('Arch-dependent resource file is ',GetExtResPathArch);
 end;
 
-function GetExtResPath(const base : shortstring) : pchar;
+function GetExtResPath(const base : shortstring) : PAnsiChar;
 var len : integer;
 begin
   len:=byte(base[0]);
@@ -221,7 +221,7 @@ begin
 //  writeln('Shared resource file is ',GetExtResPath);
 end;
 
-procedure MapResFile(var aInfo : TResFileInfo; aName : pchar);
+procedure MapResFile(var aInfo : TResFileInfo; aName : PAnsiChar);
 const
   PROT_READ  = 1;
   PROT_WRITE = 2;
@@ -265,8 +265,8 @@ begin
 end;
 
 procedure InitResources;
-var respathArch : pchar;
-    respath : pchar;
+var respathArch : PAnsiChar;
+    respath : PAnsiChar;
     basepath : shortstring;
 begin
   basepath:=GetExtResBasePath;
@@ -296,10 +296,10 @@ begin
   end;
 end;
 
-function BinSearchStr(base : PExtHeader; arr : PResInfoNode; query : pchar;
+function BinSearchStr(base : PExtHeader; arr : PResInfoNode; query : PAnsiChar;
   left, right : integer) : PResInfoNode;
 var pivot, res : integer;
-    resstr : pchar;
+    resstr : PAnsiChar;
 begin
   BinSearchStr:=nil;
   while left<=right do
@@ -317,7 +317,7 @@ begin
   end;
 end;
 
-function BinSearchInt(arr : PResInfoNode; query : pchar; left, right : integer)
+function BinSearchInt(arr : PResInfoNode; query : PAnsiChar; left, right : integer)
 : PResInfoNode;
 var pivot : integer;
 begin
@@ -335,12 +335,12 @@ begin
   end;
 end;
 
-function BinSearchRes(base : PExtHeader; root : PResInfoNode; aDesc : PChar)
+function BinSearchRes(base : PExtHeader; root : PResInfoNode; aDesc : PAnsiChar)
 : PResInfoNode;
 var aID : PtrUint;
 begin
   if InternalIsIntResource(aDesc,aID) then
-    BinSearchRes:=BinSearchInt(GetResInfoPtr(base,root^.subptr),PChar(aID),
+    BinSearchRes:=BinSearchInt(GetResInfoPtr(base,root^.subptr),PAnsiChar(aID),
       root^.ncounthandle,root^.ncounthandle+root^.idcountsize-1)
   else
     BinSearchRes:=BinSearchStr(base,GetResInfoPtr(base,root^.subptr),aDesc,0,
@@ -367,7 +367,7 @@ begin
 end;
 
 //Returns a pointer to a name node.
-function InternalFindResource(base : PExtHeader; ResourceName, ResourceType: PChar):
+function InternalFindResource(base : PExtHeader; ResourceName, ResourceType: PAnsiChar):
  PResInfoNode;
 begin
   InternalFindResource:=nil;
@@ -380,7 +380,7 @@ begin
 end;
 
 function FindResourceSingleFile(ResHeader : PExtHeader; ResourceName,
-  ResourceType: PChar) : TFPResourceHandle;
+  ResourceType: PAnsiChar) : TFPResourceHandle;
 var ptr : PResInfoNode;
 begin
   FindResourceSingleFile:=0;
@@ -400,9 +400,9 @@ end;
 
 {!fixme!}
 //function FindResourceExSingleFile(ResHeader : PExtHeader; ResourceType,
-//  ResourceName: PChar;  Language : word; out precision : integer): TFPResourceHandle;
+//  ResourceName: PAnsiChar;  Language : word; out precision : integer): TFPResourceHandle;
 function FindResourceExSingleFile(ResHeader : PExtHeader; ResourceType,
-  ResourceName: PChar;  Language : word; var precision : integer): TFPResourceHandle;
+  ResourceName: PAnsiChar;  Language : word; var precision : integer): TFPResourceHandle;
 const LANG_NEUTRAL = 0;
       LANG_ENGLISH = 9;
 var nameptr,ptr : PResInfoNode;
@@ -453,7 +453,7 @@ function EnumResourceTypesSingleFile(ResHeader,Other : PExtHeader; ModuleHandle
  : TFPResourceHMODULE; EnumFunc : EnumResTypeProc; lParam : PtrInt) : LongBool;
 var ptr,otarr : PResInfoNode;
     totn, totid, ottotn, ottotid, i : longword;
-    pc : pchar;
+    pc : PAnsiChar;
 begin
   EnumResourceTypesSingleFile:=false;
   if ResHeader=nil then exit;
@@ -482,18 +482,18 @@ begin
   end;
   while i<totid do
   begin
-    if (Other=nil) or (BinSearchInt(otarr,PChar(ptr[i].nameid),ottotn,ottotid)=nil) then
-      if not EnumFunc(ModuleHandle,PChar(ptr[i].nameid),lParam) then exit;
+    if (Other=nil) or (BinSearchInt(otarr,PAnsiChar(ptr[i].nameid),ottotn,ottotid)=nil) then
+      if not EnumFunc(ModuleHandle,PAnsiChar(ptr[i].nameid),lParam) then exit;
     inc(i);
   end;
 end;
 
 function EnumResourceNamesSingleFile(ResHeader,Other : PExtHeader;
-  ModuleHandle : TFPResourceHMODULE; ResourceType : PChar;
+  ModuleHandle : TFPResourceHMODULE; ResourceType : PAnsiChar;
   EnumFunc : EnumResNameProc; lParam : PtrInt) : LongBool;
 var ptr,otarr : PResInfoNode;
     totn, totid, ottotn, ottotid, i : longword;
-    pc : pchar;
+    pc : PAnsiChar;
 begin
   EnumResourceNamesSingleFile:=False;
   if ResHeader=nil then exit;
@@ -529,14 +529,14 @@ begin
   end;
   while i<totid do
   begin
-    if (otarr=nil) or (BinSearchInt(otarr,PChar(ptr[i].nameid),ottotn,ottotid)=nil) then
-      if not EnumFunc(ModuleHandle,ResourceType,PChar(ptr[i].nameid),lParam) then exit;
+    if (otarr=nil) or (BinSearchInt(otarr,PAnsiChar(ptr[i].nameid),ottotn,ottotid)=nil) then
+      if not EnumFunc(ModuleHandle,ResourceType,PAnsiChar(ptr[i].nameid),lParam) then exit;
     inc(i);
   end;
 end;
 
 function EnumResourceLanguagesSingleFile(ResHeader,Other : PExtHeader;
-  ModuleHandle : TFPResourceHMODULE; ResourceType, ResourceName : PChar;
+  ModuleHandle : TFPResourceHMODULE; ResourceType, ResourceName : PAnsiChar;
   EnumFunc : EnumResLangProc; lParam : PtrInt) : LongBool;
 var ptr, otarr : PResInfoNode;
     tot, ottot, i : integer;
@@ -563,7 +563,7 @@ begin
   i:=0;
   while i<tot do
   begin
-    if (otarr=nil) or (BinSearchInt(otarr,PChar(ptr[i].nameid),0,ottot)=nil) then
+    if (otarr=nil) or (BinSearchInt(otarr,PAnsiChar(ptr[i].nameid),0,ottot)=nil) then
       if not EnumFunc(ModuleHandle,ResourceType,ResourceName,PtrUInt(
         ptr[i].nameid),lParam) then exit;
     inc(i);
@@ -588,7 +588,7 @@ begin
     ResFileInfoArch.Resheader,ModuleHandle,EnumFunc,lParam) then ExtEnumResourceTypes:=true;
 end;
 
-function ExtEnumResourceNames(ModuleHandle : TFPResourceHMODULE; ResourceType : PChar; EnumFunc : EnumResNameProc; lParam : PtrInt) : LongBool;
+function ExtEnumResourceNames(ModuleHandle : TFPResourceHMODULE; ResourceType : PAnsiChar; EnumFunc : EnumResNameProc; lParam : PtrInt) : LongBool;
 begin
   ExtEnumResourceNames:=False;
   if EnumResourceNamesSingleFile(ResFileInfoArch.Resheader,nil,ModuleHandle,
@@ -597,7 +597,7 @@ begin
     ResFileInfoArch.Resheader,ModuleHandle,ResourceType,EnumFunc,lParam) then ExtEnumResourceNames:=true;
 end;
 
-function ExtEnumResourceLanguages(ModuleHandle : TFPResourceHMODULE; ResourceType, ResourceName : PChar; EnumFunc : EnumResLangProc; lParam : PtrInt) : LongBool;
+function ExtEnumResourceLanguages(ModuleHandle : TFPResourceHMODULE; ResourceType, ResourceName : PAnsiChar; EnumFunc : EnumResLangProc; lParam : PtrInt) : LongBool;
 begin
   ExtEnumResourceLanguages:=False;
   if EnumResourceLanguagesSingleFile(ResFileInfoArch.Resheader,nil,ModuleHandle,
@@ -607,7 +607,7 @@ begin
     lParam) then ExtEnumResourceLanguages:=true;
 end;
 
-function ExtFindResource(ModuleHandle: TFPResourceHMODULE; ResourceName, ResourceType: PChar): TFPResourceHandle;
+function ExtFindResource(ModuleHandle: TFPResourceHMODULE; ResourceName, ResourceType: PAnsiChar): TFPResourceHandle;
 begin
   //search for resource in architecture-dependent res file first
   ExtFindResource:=FindResourceSingleFile(ResFileInfoArch.ResHeader,ResourceName,ResourceType);
@@ -615,7 +615,7 @@ begin
     ExtFindResource:=FindResourceSingleFile(ResFileInfo.ResHeader,ResourceName,ResourceType);
 end;
 
-function ExtFindResourceEx(ModuleHandle: TFPResourceHMODULE; ResourceType, ResourceName: PChar; Language : word): TFPResourceHandle;
+function ExtFindResourceEx(ModuleHandle: TFPResourceHMODULE; ResourceType, ResourceName: PAnsiChar; Language : word): TFPResourceHandle;
 var precar, precsh : integer;
     handlear, handlesh : TResourceHandle;
 begin

rtl/darwin/pthread.inc

@@ -70,10 +70,10 @@ function pthread_sigmask(how: cint; nset: psigset; oset: psigset): cint; cdecl;
 
 // not yet implemented in Mac OS X 10.4.8!
 // function sem_init(__sem:Psem_t; __pshared:cint;__value:cuint):cint;cdecl; external 'c' name 'sem_init';
-function sem_open(name: pchar; oflag: cint): Psem_t; cdecl; varargs; external 'c' name 'sem_open';
+function sem_open(name: PAnsiChar; oflag: cint): Psem_t; cdecl; varargs; external 'c' name 'sem_open';
 function sem_destroy(__sem:Psem_t):cint;cdecl;external 'c' name 'sem_destroy';
 function sem_close(__sem:Psem_t):cint;cdecl;external 'c'  name 'sem_close';
-function sem_unlink(__name:Pchar):cint;cdecl;external 'c' name 'sem_unlink';
+function sem_unlink(__name:PAnsiChar):cint;cdecl;external 'c' name 'sem_unlink';
 function sem_wait(__sem:Psem_t):cint;cdecl;external 'c'  name 'sem_wait';
 function sem_trywait(__sem:Psem_t):cint;cdecl;external 'c'  name 'sem_trywait';
 function sem_post(__sem:Psem_t):cint;cdecl;external 'c'  name 'sem_post';

rtl/darwin/ptypes.inc

@@ -166,9 +166,9 @@ type
           ftype : cuint32;
           fflags : cuint32;
           fssubtype : cuint32;
-          fstypename : array[0..(MFSTYPENAMELEN)-1] of char;
-          mountpoint : array[0..(PATH_MAX)-1] of char;
-          mntfromname : array[0..(PATH_MAX)-1] of char;
+          fstypename : array[0..(MFSTYPENAMELEN)-1] of AnsiChar;
+          mountpoint : array[0..(PATH_MAX)-1] of AnsiChar;
+          mntfromname : array[0..(PATH_MAX)-1] of AnsiChar;
           reserved: array[0..7] of cuint32;
      end;
 {$else}
@@ -188,10 +188,10 @@ type
           ftype : cint16;
           fflags : clong;
           reserved2 : array[0..1] of clong;
-          fstypename : array[0..(MFSNAMELEN)-1] of char;
-          mountpoint : array[0..(MNAMELEN)-1] of char;
-          mntfromname : array[0..(MNAMELEN)-1] of char;
-          f_reserved3: char;
+          fstypename : array[0..(MFSNAMELEN)-1] of AnsiChar;
+          mountpoint : array[0..(MNAMELEN)-1] of AnsiChar;
+          mntfromname : array[0..(MNAMELEN)-1] of AnsiChar;
+          f_reserved3: AnsiChar;
           reserved4: array[0..3] of clong;
        end;
 {$endif}
@@ -199,7 +199,7 @@ type
 
     mbstate_t = record
       case byte of
-        0: (__mbstate8: array[0..127] of char);
+        0: (__mbstate8: array[0..127] of AnsiChar);
         1: (_mbstateL: clonglong); { for alignment }
     end;
     pmbstate_t = ^mbstate_t;

rtl/darwin/signal.inc

@@ -176,7 +176,7 @@
     PSigSet = ^TSigSet;
 
     tdarwin_stack_t = record
-        ss_sp    : pchar;        { signal stack base }
+        ss_sp    : PAnsiChar;        { signal stack base }
         ss_size  : clong;         { signal stack length }
         ss_flags : cint;         { SA_DISABLE and/or SA_ONSTACK }
     end;
@@ -253,7 +253,7 @@ const
   type
      sigaltstack = record
   { signal stack base  }
-          ss_sp : pchar;
+          ss_sp : PAnsiChar;
   { signal stack length  }
           ss_size : clong;
   { SA_DISABLE and/or SA_ONSTACK  }

rtl/darwin/sysctlh.inc

@@ -89,7 +89,7 @@
 
   type
      ctlname = record
-          ctl_name : ^char;
+          ctl_name : ^AnsiChar;
           ctl_type : longint;
        end;
 

rtl/darwin/sysinit.pas

@@ -59,7 +59,7 @@ const
     );
 
 
-procedure FPC_SYSTEMMAIN(argcparam: Longint; argvparam: ppchar; envpparam: ppchar); cdecl; [public];
+procedure FPC_SYSTEMMAIN(argcparam: Longint; argvparam: PPAnsiChar; envpparam: PPAnsiChar); cdecl; [public];
 begin
   SysInitEntryInformation.OS.argc := argcparam;
   SysInitEntryInformation.OS.argv := argvparam;

rtl/darwin/termios.inc

@@ -562,7 +562,7 @@ Type
 {
  *        TTYDEFCHARS to include an array of default control characters.
 }
-    ttydefchars : array[0..NCCS-1] OF char =(
+    ttydefchars : array[0..NCCS-1] OF AnsiChar =(
         CEOF,   CEOL,   CEOL,   CERASE, CWERASE, CKILL, CREPRINT,
         chr(_POSIX_VDISABLE), CINTR,  CQUIT,  CSUSP,  CDSUSP, CSTART, CSTOP,  CLNEXT,
         CDISCARD, CMIN, CTIME,  CSTATUS, chr(_POSIX_VDISABLE));