From 45b5f58c4ae667abe3541fc213540ab9922743f2 Mon Sep 17 00:00:00 2001 From: Michael VAN CANNEYT Date: Thu, 22 Dec 2022 09:19:38 +0100 Subject: [PATCH] * Char -> AnsiChar --- rtl/netbsd/errnostr.inc | 2 +- rtl/netbsd/pmutext.inc | 8 ++++---- rtl/netbsd/pthread.inc | 4 ++-- rtl/netbsd/ptypes.inc | 16 ++++++++-------- rtl/netbsd/signal.inc | 6 +++--- rtl/netbsd/sysctlh.inc | 2 +- rtl/netbsd/systypes.inc | 6 +++--- rtl/netbsd/termios.inc | 6 +++--- rtl/netbsd/unxsysc.inc | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/rtl/netbsd/errnostr.inc b/rtl/netbsd/errnostr.inc index 6cda1fd6ad..717f4a6e85 100644 --- a/rtl/netbsd/errnostr.inc +++ b/rtl/netbsd/errnostr.inc @@ -16,7 +16,7 @@ { Checked using ../unix/scipts/check_errnostr.sh } const sys_errn=97; - 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 } diff --git a/rtl/netbsd/pmutext.inc b/rtl/netbsd/pmutext.inc index 4d8803ca8f..a77e9eeb26 100644 --- a/rtl/netbsd/pmutext.inc +++ b/rtl/netbsd/pmutext.inc @@ -40,13 +40,13 @@ struct __pthread_mutex_st { {$endif} record ptm_magic : dword { should be cuint}; - ptm_errorcheck : char { should be pthread_spin_t}; + ptm_errorcheck : AnsiChar { should be pthread_spin_t}; {$ifdef __CPU_SIMPLE_LOCK_PAD} - ptm_pad : array[0..2] of char; + ptm_pad : array[0..2] of AnsiChar; {$endif _CPU_SIMPLE_LOCK_PAD} - ptm_interlock : char { should be pthread_spinn_t}; + ptm_interlock : AnsiChar { should be pthread_spinn_t}; {$ifdef __CPU_SIMPLE_LOCK_PAD} - ptm_pad2 : array[0..2] of char; + ptm_pad2 : array[0..2] of AnsiChar; {$endif _CPU_SIMPLE_LOCK_PAD} ptm_owner : pointer { should be pthread_t}; ptm_waiter : pointer { should be ppthread_t}; diff --git a/rtl/netbsd/pthread.inc b/rtl/netbsd/pthread.inc index 1aaa42f1f9..361e8b253d 100644 --- a/rtl/netbsd/pthread.inc +++ b/rtl/netbsd/pthread.inc @@ -72,10 +72,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'; diff --git a/rtl/netbsd/ptypes.inc b/rtl/netbsd/ptypes.inc index aaf55fa4dd..91532728b7 100644 --- a/rtl/netbsd/ptypes.inc +++ b/rtl/netbsd/ptypes.inc @@ -122,9 +122,9 @@ struct statfs12 { long f_syncwrites; /* count of sync writes since mount */ long f_asyncwrites; /* count of async writes since mount */ long f_spare[1]; /* spare for later */ - char f_fstypename[MFSNAMELEN]; /* fs type name */ - char f_mntonname[MNAMELEN]; /* directory on which mounted */ - char f_mntfromname[MNAMELEN]; /* mounted file system */ + AnsiChar f_fstypename[MFSNAMELEN]; /* fs type name */ + AnsiChar f_mntonname[MNAMELEN]; /* directory on which mounted */ + AnsiChar f_mntfromname[MNAMELEN]; /* mounted file system */ }; *) TStatfs12 = record @@ -143,9 +143,9 @@ struct statfs12 { fsyncwrites, fasyncwrites : clong; fspare0 : array [0..0] of clong; - fstypename : array[0..MFSNamLen-1] of char; - mountpoint : array[0..MNAMLEN-1] of char; - mnfromname : array[0..MNAMLEN-1] of char; + fstypename : array[0..MFSNamLen-1] of AnsiChar; + mountpoint : array[0..MNAMLEN-1] of AnsiChar; + mnfromname : array[0..MNAMLEN-1] of AnsiChar; end; TStatFS = TStatFS12; PStatFS=^TStatFS; @@ -165,7 +165,7 @@ struct statfs12 { 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; @@ -182,7 +182,7 @@ struct statfs12 { ptma_magic : cint; ptma_private : pointer; end; - pthread_spin_t = char; + pthread_spin_t = AnsiChar; pthread_queue_t = record first, last : pointer; end; diff --git a/rtl/netbsd/signal.inc b/rtl/netbsd/signal.inc index 39d354e3d9..1dc9cd1d02 100644 --- a/rtl/netbsd/signal.inc +++ b/rtl/netbsd/signal.inc @@ -122,7 +122,7 @@ type psiginfo = ^tsiginfo; tsiginfo = record case longint of - 0 : ( _pad : array[0..(SI_PAD_SIZE)-1] of char ); + 0 : ( _pad : array[0..(SI_PAD_SIZE)-1] of AnsiChar ); 1 : ( _info : ksiginfo); { end; } end; @@ -202,9 +202,9 @@ struct sigcontext { en_opcode : word; { opcode last executed (11 bits ) } en_foo : cardinal; { floating operand offset } en_fos : cardinal; { floating operand segment selector } - fpr_acc : array[0..79] of char; + fpr_acc : array[0..79] of AnsiChar; fpr_ex_sw : cardinal; - fpr_pad : array[0..63] of char; *) + fpr_pad : array[0..63] of AnsiChar; *) end; {$endif} (* From amd64 /usr/include/machine/frame_regs.h diff --git a/rtl/netbsd/sysctlh.inc b/rtl/netbsd/sysctlh.inc index f48711c377..a5be09f2d3 100644 --- a/rtl/netbsd/sysctlh.inc +++ b/rtl/netbsd/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; diff --git a/rtl/netbsd/systypes.inc b/rtl/netbsd/systypes.inc index bb546a2a8d..9d66af3cc8 100644 --- a/rtl/netbsd/systypes.inc +++ b/rtl/netbsd/systypes.inc @@ -27,9 +27,9 @@ type ftype : longint; fflags : longint; {copy of mount flags} spare : array [0..1] of longint; { For later use } - fstypename : array[0..15] of char; - mountpoint : array[0..89] of char; - mnfromname : array[0..89] of char; + fstypename : array[0..15] of AnsiChar; + mountpoint : array[0..89] of AnsiChar; + mnfromname : array[0..89] of AnsiChar; end; PStatFS=^TStatFS; diff --git a/rtl/netbsd/termios.inc b/rtl/netbsd/termios.inc index 60fb30de61..bad68d672f 100644 --- a/rtl/netbsd/termios.inc +++ b/rtl/netbsd/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, @@ -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 ^(char) } ISIG = $80; { enable signals INTR, QUIT, [D]SUSP } ICANON = $100; { canonicalize input lines } ALTWERASE = $200; { use alternate WERASE algorithm } @@ -357,7 +357,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); diff --git a/rtl/netbsd/unxsysc.inc b/rtl/netbsd/unxsysc.inc index f6f152009b..3bb73f36a9 100644 --- a/rtl/netbsd/unxsysc.inc +++ b/rtl/netbsd/unxsysc.inc @@ -73,7 +73,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))