From 3c1d50ab72a4d5b4290ad40d58c372e7e05011f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Mon, 13 Nov 2023 13:14:03 +0100 Subject: [PATCH] * Fix unicodertl compilation --- packages/vcl-compat/src/system.ansistrings.pp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/vcl-compat/src/system.ansistrings.pp b/packages/vcl-compat/src/system.ansistrings.pp index bd58090b93..f8af19d271 100755 --- a/packages/vcl-compat/src/system.ansistrings.pp +++ b/packages/vcl-compat/src/system.ansistrings.pp @@ -468,7 +468,7 @@ end; function AnsiStartsStr(const ASubText, AText: AnsiString): Boolean; begin if (Length(AText) >= Length(ASubText)) and (ASubText <> '') then - Result := StrLComp(PChar(ASubText), PAnsiChar(AText), Length(ASubText)) = 0 + Result := StrLComp(PAnsiChar(ASubText), PAnsiChar(AText), Length(ASubText)) = 0 else Result := (AsubText=''); end; @@ -859,7 +859,7 @@ function FloatToTextFmt(Buf: PAnsiChar; const Value; ValueType: TFloatValue; Format: PAnsiChar; const AFormatSettings: TFormatSettings): Integer; Var E : Extended; - + SBuf,Fmt : String; begin Case ValueType of fvComp : E:=PComp(@Value)^; @@ -869,7 +869,9 @@ begin fvSingle : E:=PSingle(@Value)^; fvCurrency : E:=PCurrency(@Value)^; end; - Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.FloatToTextFmt(Buf,E,Format,aFormatSettings); + SBuf:=StrPas(Buf); + Fmt:=StrPas(Format); + Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.FloatToTextFmt(PChar(SBuf),E,PChar(Fmt),aFormatSettings); end; function FloatToTextFmt(Buf: PAnsiChar; const Value; ValueType: TFloatValue;