* Char -> AnsiChar

rtl/dragonfly/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;
@@ -611,10 +611,10 @@ Function KDRASTER(fd:longint;var param1 : scr_size_t):boolean;
 
 type
 
-{ get/set screen char map }
+{ get/set screen AnsiChar 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/dragonfly/errnostr.inc

@@ -15,7 +15,7 @@
 
 const
   sys_errn=100;
-  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/dragonfly/pthread.inc

@@ -68,7 +68,7 @@ struct sem {
        sysse   : cint;
        entry   : psem_t;
        backpointer : ppsem_t;
-       spare   : array[0..SEM_SAFE] of char;
+       spare   : array[0..SEM_SAFE] of AnsiChar;
 
     end;
 
@@ -106,7 +106,7 @@ function pthread_sigmask(how: cint; nset: psigset; oset: psigset): cint; cdecl;
 function sem_init(__sem:Psem_t; __pshared:cint;__value:dword):cint;cdecl; external;
 function sem_destroy(__sem:Psem_t):cint;cdecl;external ;
 function sem_close(__sem:Psem_t):cint;cdecl;external ;
-function sem_unlink(__name:Pchar):cint;cdecl;external ;
+function sem_unlink(__name:PAnsiChar):cint;cdecl;external ;
 function sem_wait(__sem:Psem_t):cint;cdecl;external ;
 function sem_trywait(__sem:Psem_t):cint;cdecl;external ;
 function sem_post(__sem:Psem_t):cint;cdecl;external ;

rtl/dragonfly/ptypes.inc

@@ -139,7 +139,7 @@ type
        sysse   : cint;
        entry   : psem_t;
        backpointer : ppsem_t;
-       spare   : array[0..SEM_SAFE] of char;
+       spare   : array[0..SEM_SAFE] of AnsiChar;
 
     end;
 
@@ -190,12 +190,12 @@ Type TStatFS = Record
         fflags       : cint32;         { copy of mount exported flags }
         fsyncwrites  : clong;          { count of sync writes since mount }
         fasyncwrites : clong;          { count of async writes since mount }
-        fstypename   : array[0..MFSNAMELEN-1] of char; { filesystem type name }
-        mntonname    : array[0..  MNAMELEN-1] of char; { directory on which mounted }
+        fstypename   : array[0..MFSNAMELEN-1] of AnsiChar; { filesystem type name }
+        mntonname    : array[0..  MNAMELEN-1] of AnsiChar; { directory on which mounted }
         fsyncreads   : clong;          { count of sync reads since mount }
         fasyncreads  : clong;          { count of async reads since mount }
         fspares1     : cshort;         { unused spare }
-        mntfromname  : array[0..  MNAMELEN-1] of char; { mounted filesystem }
+        mntfromname  : array[0..  MNAMELEN-1] of AnsiChar; { mounted filesystem }
         fspares2     : cshort;         { unused spare }
         fspares3     : clong;          { unused spare }
         fspares4     : clong;          { unused spare }
@@ -204,7 +204,7 @@ Type TStatFS = Record
 
   mbstate_t = record
       case byte of
-        0: (__mbstate8: array[0..127] of char);
+        0: (__mbstate8: array[0..127] of AnsiChar);
         1: (_mbstateL: cint64); { for alignment }
     end;
     pmbstate_t = ^mbstate_t;

rtl/dragonfly/si_intf.inc

@@ -2,6 +2,6 @@
 
 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: ptruint; public name 'operatingsystem_parameter_argc';
-  operatingsystem_parameter_argv: ppchar; public name 'operatingsystem_parameter_argv';
+  operatingsystem_parameter_argv: PPAnsiChar; public name 'operatingsystem_parameter_argv';

rtl/dragonfly/sysctlh.inc

@@ -37,7 +37,7 @@ CONST
 
 Type
     ctlname = record
-                ctl_name : pchar;       {  subsystem name }
+                ctl_name : PAnsiChar;       {  subsystem name }
                 ctl_type : cint         {  type of name }
                End;
 

rtl/dragonfly/termios.inc

@@ -60,7 +60,7 @@ type
     c_oflag,
     c_cflag,
     c_lflag  : longint;
-//    c_line   : char;
+//    c_line   : AnsiChar;
     c_cc     : array[0..NCCS-1] of byte;
    {$IFDEF BSD}
     c_ispeed,
@@ -91,7 +91,7 @@ CONST
         ICRNL           =     $100;     { map CR to NL (ala CRMOD) }
         IXON            =     $200;     { enable output flow control }
         IXOFF           =     $400;     { enable input flow control }
-        IXANY           =     $800;     { any char will restart after stop }
+        IXANY           =     $800;     { any AnsiChar will restart after stop }
         IMAXBEL         =    $2000;     { ring bell on input queue full }
 
 {
@@ -139,7 +139,7 @@ CONST
         ECHO            =       $8;     { enable echoing }
         ECHONL          =      $10;     { echo NL even if ECHO is off }
         ECHOPRT         =      $20;     { visual erase mode for hardcopy }
-        ECHOCTL         =      $40;     { echo control chars as ^(Char) }
+        ECHOCTL         =      $40;     { echo control chars as ^(AnsiChar) }
         ISIG            =      $80;     { enable signals INTR, QUIT, [D]SUSP }
         ICANON          =     $100;     { canonicalize input lines }
         ALTWERASE       =     $200;     { use alternate WERASE algorithm }
@@ -368,7 +368,7 @@ struct winsize {
 {
  *        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,
         POSIX_VDISABLE, CINTR,  CQUIT,  CSUSP,  CDSUSP, CSTART, CSTOP,  CLNEXT,
         CDISCARD, CMIN, CTIME,  CSTATUS, POSIX_VDISABLE);

rtl/dragonfly/unxsysc.inc

@@ -66,7 +66,7 @@ begin
   fpfstatfs:=do_SysCall(SysCall_nr_fstatfs,fd,TSysParam(info))
 end;
 
-Function  fpStatFS  (Path:pchar; Info:pstatfs):cint;
+Function  fpStatFS  (Path:PAnsiChar; Info:pstatfs):cint;
 
 begin
   fpstatfs:=do_SysCall(SysCall_nr_statfs,TSysParam(path),TSysParam(Info))

rtl/dragonfly/x86_64/si_c.inc

@@ -3,9 +3,9 @@ Type
     TCleanup = procedure; cdecl;
 
 var 
-  environ : ppchar; cvar; public  name '__environ';
-  progname: pchar = #0#0; cvar; public name '__progname';
-  dynamic : pchar;  external name '_DYNAMIC'; // #pragma weak
+  environ : PPAnsiChar; cvar; public  name '__environ';
+  progname: PAnsiChar = #0#0; cvar; public name '__progname';
+  dynamic : PAnsiChar;  external name '_DYNAMIC'; // #pragma weak
 
 procedure atexit(prc:TCleanup); cdecl external name 'atexit';
 procedure cleanup(prc:TCleanup); cdecl external name 'cleanup';			
@@ -13,7 +13,7 @@ procedure init_tls; cdecl; external name 'init_tls';
 procedure fini; cdecl; external name '_fini';
 procedure init; cdecl; external name '_init';
 procedure libc_exit(exitcode:longint);cdecl; external name 'exit';
-function  main(nrarg:longint;pp:ppchar;env:ppchar):longint; cdecl; external name 'main';
+function  main(nrarg:longint;pp:PPAnsiChar;env:PPAnsiChar):longint; cdecl; external name 'main';
 
 {$ifdef gcrt}
  procedure cmcleanup; cdecl; external name '_mcleanup';
@@ -24,16 +24,16 @@ var
  etext:longint; external name 'etext';
 {$endif}
 
-procedure start(ap:ppchar;cleanup:TCleanup);
+procedure start(ap:PPAnsiChar;cleanup:TCleanup);
 
 var argc: longint;
-    argv: ppchar;
-    env : ppchar;
-    s   : pchar;
+    argv: PPAnsiChar;
+    env : PPAnsiChar;
+    s   : PAnsiChar;
 begin
   argc:=plongint(ap)^; 
-  argv:=ppchar(ap[1]);
-  env:=	ppchar(ap[2+argc]);
+  argv:=PPAnsiChar(ap[1]);
+  env:=	PPAnsiChar(ap[2+argc]);
   environ:=env;
   if (argc>0) and (argv[0]<>#0) Then
    begin
@@ -46,7 +46,7 @@ begin
           inc(s);
 	end; 
     end;
-  if assigned(pchar(@dynamic)) then // I suspect this is a trick to find
+  if assigned(PAnsiChar(@dynamic)) then // I suspect this is a trick to find
 				    // out runtime if we are shared
 				    // linking, so the same code can be used
 				    // for static and shared linking

rtl/dragonfly/x86_64/signal.inc

@@ -177,7 +177,7 @@ type sigset_t = array[0..3] of Longint;
 
   pstack_t = ^stack_t;
   stack_t = record
-    ss_sp   : pChar;                    {* signal stack base *}
+    ss_sp   : PAnsiChar;                    {* signal stack base *}
     ss_size : size_t;                   {* signal stack length *}
     ss_flags: cint32;                   {* SS_DISABLE and/or SS_ONSTACK *}
   end;