Browse Source

* Fix compilation under unicode rtl

Michaël Van Canneyt 9 months ago
parent
commit
06eaec4313

+ 1 - 1
packages/fcl-fpterm/src/fpterm.controller.pas

@@ -1791,7 +1791,7 @@ begin
   begin
     if Pos(':', SGRAttr) <> 0 then
     begin
-      ExtParas := SGRAttr.Split(':');
+      ExtParas := SGRAttr.Split(String(':'));
       ExtPara1 := StrToIntDef(ExtParas[0], 0);
       case ExtPara1 of
         38,

+ 2 - 2
packages/fcl-fpterm/src/fpterm.inputoutputconnection.unixpty.pas

@@ -51,7 +51,7 @@ type
     function IsDataAvailable: Boolean;
     function IsClosed: Boolean;
   public
-    constructor Create(const progname: string; argv, envp: PPChar; Width, Height: Integer);
+    constructor Create(const progname: ansistring; argv, envp: PPansiChar; Width, Height: Integer);
     destructor Destroy; override;
 
     function Read(var Buffer; Bytes: SizeUInt): SizeInt;
@@ -94,7 +94,7 @@ begin
 end;
 
 constructor TTerminalInputOutputConnection_UnixPty.Create(
-  const progname: string; argv, envp: PPChar; Width, Height: Integer);
+  const progname: ansistring; argv, envp: PPAnsiChar; Width, Height: Integer);
 begin
   FUnixPseudoTerminal := TUnixPseudoTerminal.Create(progname, argv, envp, Width, Height);
 end;

+ 3 - 3
packages/fcl-fpterm/src/fpterm.pseudoterminal.unix.pas

@@ -50,7 +50,7 @@ type
     FChildPid: TPid;
     FFdSlave, FFdMaster: cint;
   public
-    constructor Create(const progname: string; argv, envp: PPChar; Width, Height: Integer);
+    constructor Create(const progname: ansistring; argv, envp: PPAnsiChar; Width, Height: Integer);
     procedure Resize(NewWidth, NewHeight: Integer);
 
     property FdMaster: cint read FFdMaster;
@@ -68,8 +68,8 @@ uses
 
 { TUnixPseudoTerminal }
 
-constructor TUnixPseudoTerminal.Create(const progname: string; argv,
-  envp: PPChar; Width, Height: Integer);
+constructor TUnixPseudoTerminal.Create(const progname: ansistring; argv,
+  envp: PPansiChar; Width, Height: Integer);
 var
   ws: TWinSize;
 begin

+ 1 - 1
rtl/unix/unix98pty.pp

@@ -44,7 +44,7 @@ uses
 function fpposix_openpt(flags: cint): cint; external 'c' name 'posix_openpt';
 function fpgrantpt(fd: cint): cint; external 'c' name 'grantpt';
 function fpunlockpt(fd: cint): cint; external 'c' name 'unlockpt';
-function fpptsname(fd: cint): PChar; external 'c' name 'ptsname';
+function fpptsname(fd: cint): PAnsiChar; external 'c' name 'ptsname';
 
 implementation