Bläddra i källkod

* Char -> AnsiChar

Michael VAN CANNEYT 2 år sedan
förälder
incheckning
af5a10946d

+ 1 - 1
rtl/aix/dlaix.inc

@@ -24,7 +24,7 @@
       ldinfo_textsize: ptrint;
       ldinfo_dataorg: pointer;
       ldinfo_datasize: ptrint;
-      ldinfo_filename: pchar;
+      ldinfo_filename: PAnsiChar;
     end;
 
   function loadquery(__lflags: cint; __buffer: pointer; __length: cuint): longint; cdecl; varargs; external;

+ 1 - 1
rtl/aix/errnostr.inc

@@ -18,5 +18,5 @@ const
 
 { since we're libc-based, just just the libc version }
 var
-  sys_errlist:array[0..sys_errn-1] of pchar; cvar; external;
+  sys_errlist:array[0..sys_errn-1] of PAnsiChar; cvar; external;
 

+ 8 - 8
rtl/aix/ostypes.inc

@@ -101,11 +101,11 @@ TYPE
 
    { system information services }
    utsname = record
-     sysname : array[0..UTSNAME_LENGTH] of char;
-     nodename : array[0..UTSNAME_LENGTH] of char;
-     release : array[0..UTSNAME_LENGTH] of char;
-     version : array[0..UTSNAME_LENGTH] of char;
-     machine : array[0..UTSNAME_LENGTH] of char;
+     sysname : array[0..UTSNAME_LENGTH] of AnsiChar;
+     nodename : array[0..UTSNAME_LENGTH] of AnsiChar;
+     release : array[0..UTSNAME_LENGTH] of AnsiChar;
+     version : array[0..UTSNAME_LENGTH] of AnsiChar;
+     machine : array[0..UTSNAME_LENGTH] of AnsiChar;
    end;
 
    UTimBuf   = Record
@@ -125,7 +125,7 @@ TYPE
              d_ino : ino64_t;                  {* "inode number" of entry *}
              d_reclen : cushort;             {* length of this record *}
              d_namelen : cushort;
-             d_name : array[0..255] of char; { name of file            }
+             d_name : array[0..255] of AnsiChar; { name of file            }
             );
        { overlay with alias }
        2 : (
@@ -142,14 +142,14 @@ TYPE
            d_fd : cint;               {* file descriptor *}
            d_loc : cint;              {* offset in block *}
            d_size : cint;             {* amount of valid data *}
-           d_buf : pchar;             { directory block   }
+           d_buf : PAnsiChar;             { directory block   }
           );
       { overlay for posix compatibility }
       2 : (
            dd_fd : cint;               {* file descriptor *}
            dd_loc : cint;              {* offset in block *}
            dd_size : cint;             {* amount of valid data *}
-           dd_buf : pchar;             { directory block   }
+           dd_buf : PAnsiChar;             { directory block   }
           );
    end;
 

+ 1 - 1
rtl/aix/pthread.inc

@@ -113,7 +113,7 @@ function pthread_sigmask(how: cint; nset: psigset; oset: psigset): cint; cdecl;
 function sem_init(__sem:Psem_t; __pshared:cint;__value:cuint):cint;cdecl; external 'c' name 'sem_init';
 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_timedwait(__sem: Psem_t; const __timespec: ptimespec): cint;cdecl; external 'c' name 'sem_timedwait';
 function sem_trywait(__sem:Psem_t):cint;cdecl;external 'c'  name 'sem_trywait';

+ 3 - 3
rtl/aix/ptypes.inc

@@ -81,7 +81,7 @@ Type
     pTime     = ^time_t;
     ptime_t   = ^time_t;
     clockid_t = clonglong;
-    caddr_t   = ^char;
+    caddr_t   = ^AnsiChar;
 
     uint32_t = cuint32;
     int32_t = cint32;
@@ -173,8 +173,8 @@ Type
     vfsoff : cint;     { reserved, for vfs specific data offset }
     vfslen : cint;     { reserved, for len of vfs specific data }
     vfsvers : cint;    { reserved, for vers of vfs specific data }
-    fstr   : array[0..31] of char; { fname in C header, file system name (usually mount pt.) }
-    fpack   : array[0..31] of char; { file system pack name }
+    fstr   : array[0..31] of AnsiChar; { fname in C header, file system name (usually mount pt.) }
+    fpack   : array[0..31] of AnsiChar; { file system pack name }
     namelen : cint; { maximum component name length for posix }
   end;
   PStatFS=^TStatFS;

+ 1 - 1
rtl/aix/sighndh.inc

@@ -36,7 +36,7 @@ type
   mstsave = record
     prev: pmstsave;
     kjmpbuf: plabel_t;
-    stackfix: pchar;
+    stackfix: PAnsiChar;
     intpri: byte;
     backt: byte;
     rsvd: array[0..1] of byte;

+ 5 - 5
rtl/aix/system.pp

@@ -25,8 +25,8 @@ interface
 {$I sysunixh.inc}
 
 var argc:longint;
-    argv:PPchar;
-    envp:PPchar;
+    argv:PPAnsiChar;
+    envp:PPAnsiChar;
 
 implementation
 
@@ -41,7 +41,7 @@ implementation
 
 procedure pascalmain;external name 'PASCALMAIN';
 
-procedure FPC_SYSTEMMAIN(argcparam: Longint; argvparam: ppchar; envpparam: ppchar); cdecl; [public];
+procedure FPC_SYSTEMMAIN(argcparam: Longint; argvparam: PPAnsiChar; envpparam: PPAnsiChar); cdecl; [public];
 
 begin
   argc:=argcparam;
@@ -63,7 +63,7 @@ Begin
 End;
 
 
-function BackPos(c:char; const s: shortstring): integer;
+function BackPos(c:AnsiChar; const s: shortstring): integer;
 var
  i: integer;
 Begin
@@ -163,7 +163,7 @@ var
   len,j,
   size,i : longint;
   found  : boolean;
-  buf    : pchar;
+  buf    : PAnsiChar;
 
   procedure AddBuf;
   begin

+ 2 - 2
rtl/aix/termios.inc

@@ -53,7 +53,7 @@ const
 type
   Ptty_page = ^tty_page;
   tty_page = record
-      tp_flags : char;
+      tp_flags : AnsiChar;
       tp_slen : byte;
     end;
 
@@ -197,7 +197,7 @@ const
 //  TIOCSLTC =         IOC_IN or ((sizeof(struct ltchars) and IOCPARM_MASK) shl 16) or (ord('t') shl 8) or 117{ set local special chars }
 //  TIOCGLTC =         IOC_OUT or ((sizeof(struct ltchars) and IOCPARM_MASK) shl 16) or (ord('t') shl 8) or 116{ get local special chars }
   TIOCOUTQ =         IOC_OUT or ((sizeof(cint) and IOCPARM_MASK) shl 16) or (ord('t') shl 8) or 115;     { output queue size }
-  TIOCSTI =          IOC_IN or ((sizeof(char) and IOCPARM_MASK) shl 16) or (ord('t') shl 8) or 114;    { simulate terminal input }
+  TIOCSTI =          IOC_IN or ((sizeof(AnsiChar) and IOCPARM_MASK) shl 16) or (ord('t') shl 8) or 114;    { simulate terminal input }
   TIOCNOTTY =        IOC_VOID or (ord('t') shl 8) or 113;           { void tty association }
   TIOCPKT =          IOC_IN or ((sizeof(cint) and IOCPARM_MASK) shl 16) or (ord('t') shl 8) or 112;     { pty: set/clear packet mode }
   TIOCPKT_DATA =             $00;    { data packet }

+ 1 - 1
rtl/aix/unxfunc.inc

@@ -62,7 +62,7 @@ end;
 
 function GetTimezoneFile:shortstring;
 var
-  tzenv : pchar;
+  tzenv : PAnsiChar;
   l: longint;
   s: shortstring;
   ft : text;