paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-20 19:29:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Merging revisions 42888 from trunk:

Browse Source 
------------------------------------------------------------------------
    r42888 | mattias | 2019-09-01 15:39:23 +0200 (Sun, 01 Sep 2019) | 1 line
    
    fcl-json: fixed compile with fpc 3.0.4
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43253 -
This commit is contained in:
michael 2019-10-19 14:46:35 +00:00
parent 616e4f7342
commit d785134a57
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/fcl-json/src/fpjson.pp
View File

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