From f12605d21062c5800a358261e0bdb8e930b38f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Sat, 14 Jan 2023 22:17:44 +0100 Subject: [PATCH] * PChar -> PAnsiChar --- packages/rtl-extra/src/bsd/ipcbsd.inc | 2 +- packages/rtl-extra/src/linux/ipccall.inc | 6 +++--- packages/rtl-extra/src/linux/ipcsys.inc | 2 +- packages/rtl-extra/src/unix/ipc.pp | 8 ++++---- packages/rtl-extra/src/unix/ipccdecl.inc | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/rtl-extra/src/bsd/ipcbsd.inc b/packages/rtl-extra/src/bsd/ipcbsd.inc index 38444526f8..60bc14a029 100644 --- a/packages/rtl-extra/src/bsd/ipcbsd.inc +++ b/packages/rtl-extra/src/bsd/ipcbsd.inc @@ -14,7 +14,7 @@ **********************************************************************} -function ftok(path:Pchar; id:cint):key_t; +function ftok(path:PAnsiChar; id:cint):key_t; var st:stat; diff --git a/packages/rtl-extra/src/linux/ipccall.inc b/packages/rtl-extra/src/linux/ipccall.inc index 88037c6dc1..506cf68364 100644 --- a/packages/rtl-extra/src/linux/ipccall.inc +++ b/packages/rtl-extra/src/linux/ipccall.inc @@ -14,7 +14,7 @@ ***********************************************************************} { The following definitions come from linux/ipc.h } -Function ftok (Path : pchar; ID : cint) : TKey; +Function ftok (Path : PAnsiChar; ID : cint) : TKey; Var Info : TStat; begin If fpstat(path,info)<0 then @@ -60,12 +60,12 @@ begin end; Function shmat (shmid:cint; shmaddr:pointer; shmflg:cint):pointer; -Var raddr : pchar; +Var raddr : PAnsiChar; error : ptrint; begin error:=ipccall(CALL_SHMAT,shmid,shmflg,cint(@raddr),shmaddr,0); If Error<0 then - shmat:=pchar(error) + shmat:=PAnsiChar(error) else shmat:=raddr; end; diff --git a/packages/rtl-extra/src/linux/ipcsys.inc b/packages/rtl-extra/src/linux/ipcsys.inc index e67a0f9d9c..ecca16feb5 100644 --- a/packages/rtl-extra/src/linux/ipcsys.inc +++ b/packages/rtl-extra/src/linux/ipcsys.inc @@ -14,7 +14,7 @@ ***********************************************************************} -Function ftok (Path : pchar; ID : cint) : TKey; +Function ftok (Path : PAnsiChar; ID : cint) : TKey; Var Info : TStat; begin If fpstat(path,info)<0 then diff --git a/packages/rtl-extra/src/unix/ipc.pp b/packages/rtl-extra/src/unix/ipc.pp index a382f7277c..070c5b7176 100644 --- a/packages/rtl-extra/src/unix/ipc.pp +++ b/packages/rtl-extra/src/unix/ipc.pp @@ -205,7 +205,7 @@ type { Function to generate a IPC key. } -Function ftok (Path : pchar; ID : cint) : TKey; {$ifdef FPC_USE_LIBC} cdecl; external clib name 'ftok'; {$endif} +Function ftok (Path : PAnsiChar; ID : cint) : TKey; {$ifdef FPC_USE_LIBC} cdecl; external clib name 'ftok'; {$endif} { ---------------------------------------------------------------------- Sys V Shared memory stuff @@ -477,11 +477,11 @@ type msg_next : PMSG; msg_attr : TMsg_Hdr; msg_ts : cuint; - msg_spot : pchar; + msg_spot : PAnsiChar; {$else} msg_next : PMSG; msg_type : Longint; - msg_spot : PChar; + msg_spot : PAnsiChar; msg_stime : Longint; msg_ts : Integer; {$endif} @@ -618,7 +618,7 @@ type PMSGbuf = ^TMSGbuf; TMSGbuf = record // called mymsg on freebsd and SVID manual mtype : clong; - mtext : array[0..0] of char; + mtext : array[0..0] of AnsiChar; end; {$if defined(linux)} diff --git a/packages/rtl-extra/src/unix/ipccdecl.inc b/packages/rtl-extra/src/unix/ipccdecl.inc index 3597eaeadb..4a48e072a3 100644 --- a/packages/rtl-extra/src/unix/ipccdecl.inc +++ b/packages/rtl-extra/src/unix/ipccdecl.inc @@ -27,9 +27,9 @@ Function cmsgsnd(msqid:cint; msgp: PMSGBuf; msgsz: size_t; msgflg:cint): cint; Function cmsgrcv(msqid:cint; msgp: PMSGBuf; msgsz: size_t; msgtyp:cint; msgflg:cint):cint; cdecl; external; Function cmsgctl(msqid:cint; cmd: cint; buf: PMSQid_ds): cint; cdecl; external; -function cftok(path:Pchar; id:cint):key_t; cdecl; external; +function cftok(path:PAnsiChar; id:cint):key_t; cdecl; external; -function ftok(path:Pchar; id:cint):key_t; +function ftok(path:PAnsiChar; id:cint):key_t; var st:stat;