Pārlūkot izejas kodu

pastojs: fixed compile under nodejs

git-svn-id: trunk@41505 -
Mattias Gaertner 6 gadi atpakaļ
vecāks
revīzija
e41d075fda
2 mainītis faili ar 4 papildinājumiem un 2 dzēšanām
  1. 4 0
      packages/fcl-json/src/fpjson.pp
  2. 0 2
      packages/pastojs/src/fppas2js.pp

+ 4 - 0
packages/fcl-json/src/fpjson.pp

@@ -3183,7 +3183,11 @@ begin
       DoError(SErrNameMustBeString,[I+1]);
     Inc(I);
     J:=VarRecToJSON(Elements[i],'Object');
+    {$IFDEF FPC_HAS_CPSTRING}
     Add(UTF8Encode(AName),J);
+    {$ELSE}
+    Add(AName,J);
+    {$ENDIF}
     Inc(I);
     end;
 end;

+ 0 - 2
packages/pastojs/src/fppas2js.pp

@@ -12973,7 +12973,6 @@ begin
           else if (C=TPasClassConstructor)
               or (C=TPasClassDestructor) then
             begin
-//              writeln('FFF2 TPasToJSConverter.ConvertClassType ',GetObjName(P));
             AddGlobalClassMethod(AContext,TPasProcedure(P));
             continue;
             end;
@@ -15691,7 +15690,6 @@ begin
   First:=nil;
   Last:=nil;
   try
-//    writeln('FFF1 TPasToJSConverter.AddClassConstructors ',length(RootContext.GlobalClassMethods));
     for i:=0 to length(RootContext.GlobalClassMethods)-1 do
       begin
       Proc:=RootContext.GlobalClassMethods[i];