paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-15 23:27:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

pastojs: fixed compilation

Browse Source 
git-svn-id: trunk@40075 -
This commit is contained in:
Mattias Gaertner 2018-10-29 10:16:58 +00:00
parent ee8215e2ed
commit 60eb591844
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,7 @@ type
TJSONCharType = AnsiChar; TJSONCharType = AnsiChar;
PJSONCharType = ^TJSONCharType; PJSONCharType = ^TJSONCharType;
TJSONVariant = variant; TJSONVariant = variant;
TFPJSStream = TStream; TFPJSStream = TMemoryStream;
{$else} {$else}
TJSONCharType = char; TJSONCharType = char;
TJSONVariant = jsvalue; TJSONVariant = jsvalue;

8
packages/pastojs/src/pas2jscompiler.pp
View File

@ -4231,7 +4231,7 @@ const
begin begin
LastCharStart:=p; LastCharStart:=p;
{$IFDEF FPC_HAS_CPSTRING} {$IFDEF FPC_HAS_CPSTRING}
Len:=UTF8CharacterStrictLength(p); Len:=UTF8CharacterStrictLength(@s[p]);
if Len=0 then Len:=1; if Len=0 then Len:=1;
inc(p,Len); inc(p,Len);
{$ELSE} {$ELSE}
@ -4333,11 +4333,11 @@ begin
{$IFDEF HasPas2jsFiler} {$IFDEF HasPas2jsFiler}
if PrecompileFormats.Count>0 then if PrecompileFormats.Count>0 then
begin begin
l(' -JU<x> : Create precompiled units in format x.'); w(' -JU<x> : Create precompiled units in format x.');
for i:=0 to PrecompileFormats.Count-1 do for i:=0 to PrecompileFormats.Count-1 do
with PrecompileFormats[i] do with PrecompileFormats[i] do
l(' -JU'+Ext+' : '+Description); w(' -JU'+Ext+' : '+Description);
l(' -JU- : Disable prior -JU<x> option. Do not create precompiled units.'); w(' -JU- : Disable prior -JU<x> option. Do not create precompiled units.');
end; end;
{$ENDIF} {$ENDIF}
w(' -l : Write logo'); w(' -l : Write logo');

1
utils/pas2js/nodepas2js.pp
View File

@ -13,4 +13,5 @@ uses
begin begin
// Your code here // Your code here
end. end.