Browse Source

* Merging revisions 42888 from trunk:
------------------------------------------------------------------------
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 -

michael 5 years ago
parent
commit
d785134a57
1 changed files with 3 additions and 1 deletions
  1. 3 1
      packages/fcl-json/src/fpjson.pp

+ 3 - 1
packages/fcl-json/src/fpjson.pp

@@ -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);