1
0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-01-13 10:22:04 +02:00

Fix for issue #414 : Error Building on XE2

This commit is contained in:
salvadordf 2022-04-26 12:14:05 +02:00
parent 63bd707553
commit 57364ec1b9
2 changed files with 11 additions and 6 deletions

View File

@ -109,7 +109,7 @@ begin
while (i >= 0) do
begin
if (FArgVCopy[i] <> nil) then
{$IFNDEF FPC}System.AnsiStrings.{$ENDIF}StrDispose(FArgVCopy[i]);
{$IFDEF DELPHI18_UP}System.AnsiStrings.{$ENDIF}StrDispose(FArgVCopy[i]);
dec(i);
end;
@ -136,11 +136,16 @@ begin
while (i < aArgc) do
begin
{$IFDEF FPC}
FArgVCopy[i] := StrAlloc(length(aArgv[i]) + 1);
StrCopy(FArgVCopy[i], aArgv[i]);
FArgVCopy[i] := StrAlloc(length(aArgv[i]) + 1);
StrCopy(FArgVCopy[i], aArgv[i]);
{$ELSE}
FArgVCopy[i] := AnsiStrAlloc(length(aArgv[i]) + 1);
System.AnsiStrings.StrCopy(FArgVCopy[i], aArgv[i]);
{$IFDEF DELPHI18_UP}
FArgVCopy[i] := System.AnsiStrings.AnsiStrAlloc(length(aArgv[i]) + 1);
System.AnsiStrings.StrCopy(FArgVCopy[i], aArgv[i]);
{$ELSE}
FArgVCopy[i] := System.SysUtils.AnsiStrAlloc(length(aArgv[i]) + 1);
System.SysUtils.StrCopy(FArgVCopy[i], aArgv[i]);
{$ENDIF}
{$ENDIF}
inc(i);

View File

@ -773,7 +773,7 @@ const
// FPC works fine with a high(integer) value but if we try to use
// integer(high(cardinal)) then it duplicates the result string.
// Delphi however works fine with integer(high(cardinal)) but it doesn't show
// any resul string if we use high(integer)
// any result string when we use high(integer)
{$IFDEF FPC}
UINT32_MAX = high(integer);
{$ELSE}