From c3ae0f396743ab26aa3b18588f9052c62194136c Mon Sep 17 00:00:00 2001
From: martin <laz.git@mfriebe.de>
Date: Mon, 23 Oct 2017 03:10:38 +0000
Subject: [PATCH] PascalScript: reverted some derivations from the git version

git-svn-id: trunk@56160 -
---
 components/PascalScript/Source/x86.inc               | 2 +-
 components/PascalScript/dunit/CompilerTestSimple.pas | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/PascalScript/Source/x86.inc b/components/PascalScript/Source/x86.inc
index c04c6d365f..b5466663af 100644
--- a/components/PascalScript/Source/x86.inc
+++ b/components/PascalScript/Source/x86.inc
@@ -594,7 +594,7 @@ begin
               {$IFNDEF PS_NOWIDESTRING}btWideChar, {$ENDIF}btu16, bts16:  tbtu16(res.dta^) := RealCall_Register(Address, EAX, EDX, ECX, @Stack[Length(Stack)-3], Length(Stack) div 4, 2, nil);
               btClass :
               begin
-              {$IF DEFINED (fpc) and (fpc_version <= 3)}
+              {$IF DEFINED (fpc) and (fpc_version < 3)}
                 if IsConstructor or IsVirtualCons then
                   tbtu32(res.dta^) := RealCall_Register(Address, EDX, EAX, ECX,
                   @Stack[Length(Stack) - 3], Length(Stack) div 4, 4, nil)
diff --git a/components/PascalScript/dunit/CompilerTestSimple.pas b/components/PascalScript/dunit/CompilerTestSimple.pas
index 65c4bd0f39..8fa2e41eb9 100644
--- a/components/PascalScript/dunit/CompilerTestSimple.pas
+++ b/components/PascalScript/dunit/CompilerTestSimple.pas
@@ -266,7 +266,7 @@ end;
 
 procedure TCompilerTestSimple.CreateObject;
 begin
-  CompileRun('var r: TObject; begin r := TObject.Create; r.Destroy; end.');
+  CompileRun('var r: TObject; begin r := TObject.Create; r.Free; end.');
 end;
 
 procedure TCompilerTestSimple.CharTest2;