|
@@ -1016,12 +1016,14 @@ Var
|
|
SS : TStringStream;
|
|
SS : TStringStream;
|
|
begin
|
|
begin
|
|
if Assigned(JPSH) then
|
|
if Assigned(JPSH) then
|
|
- JPSH(JSON,useUTF8,Result)
|
|
|
|
|
|
+ JPSH(JSON,UseUTF8,Result)
|
|
else
|
|
else
|
|
begin
|
|
begin
|
|
|
|
+ {$IF FPC_FULLVERSION>30300}
|
|
if UseUTF8 then
|
|
if UseUTF8 then
|
|
SS:=TStringStream.Create(JSON,TEncoding.UTF8)
|
|
SS:=TStringStream.Create(JSON,TEncoding.UTF8)
|
|
else
|
|
else
|
|
|
|
+ {$ENDIF}
|
|
SS:=TStringStream.Create(JSON);
|
|
SS:=TStringStream.Create(JSON);
|
|
try
|
|
try
|
|
Result:=GetJSON(SS,UseUTF8);
|
|
Result:=GetJSON(SS,UseUTF8);
|