Skip to content

Commit f55409a

Browse files
author
Martijn Laan
committed
Add PS_USECLASSICINVOKE to make it possible to avoid using InvokeCall.inc which was introduced by #207. Alse cleanup the case some of the directives here and make it work on AUTOREFCOUNT.
1 parent 45b18b0 commit f55409a

File tree

1 file changed

+29
-23
lines changed

1 file changed

+29
-23
lines changed

Source/uPSRuntime.pas

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9839,15 +9839,21 @@ procedure DestroyOpenArray(Sender: TPSExec; V: POpenArray);
98399839
end;
98409840

98419841

9842-
{$ifndef FPC}
9842+
{$IFNDEF FPC}
98439843
{$UNDEF _INVOKECALL_INC_}
9844-
{$IFDEF DELPHI23UP} // DELPHI2010UP == DELPHI14UP
9845-
{$IFDEF AUTOREFCOUNT}
9846-
{$fatal Pascal Script does not supports compilation with AUTOREFCOUNT at the moment!}
9847-
{$ELSE}
9848-
{$include InvokeCall.inc}
9849-
{$DEFINE _INVOKECALL_INC_}
9850-
{$ENDIF}
9844+
{$UNDEF USEINVOKECALL}
9845+
9846+
{$IFDEF DELPHI23UP}
9847+
{$IFNDEF AUTOREFCOUNT}
9848+
{$IFNDEF PS_USECLASSICINVOKE}
9849+
{$DEFINE USEINVOKECALL}
9850+
{$ENDIF}
9851+
{$ENDIF}
9852+
{$ENDIF}
9853+
9854+
{$IFDEF USEINVOKECALL}
9855+
{$include InvokeCall.inc}
9856+
{$DEFINE _INVOKECALL_INC_}
98519857
{$ELSE}
98529858
{$IFDEF Delphi6UP}
98539859
{$IFDEF CPUX64}
@@ -9859,23 +9865,23 @@ procedure DestroyOpenArray(Sender: TPSExec; V: POpenArray);
98599865
{$include x86.inc}
98609866
{$ENDIF}
98619867
{$ENDIF}
9862-
{$else} //fpc includes left unchanged.
9863-
{$IFDEF Delphi6UP}
9864-
{$if defined(cpu86)}
9865-
{$include x86.inc}
9866-
{$elseif defined(cpupowerpc)}
9867-
{$include powerpc.inc}
9868-
{$elseif defined(cpuarm)}
9869-
{$include arm.inc}
9870-
{$elseif defined(CPUX86_64)}
9871-
{$include x64.inc}
9872-
{$else}
9873-
{$fatal Pascal Script is not supported for your architecture at the moment!}
9874-
{$ifend}
98759868
{$ELSE}
9876-
{$include x86.inc}
9869+
{$IFDEF Delphi6UP}
9870+
{$if defined(cpu86)}
9871+
{$include x86.inc}
9872+
{$elseif defined(cpupowerpc)}
9873+
{$include powerpc.inc}
9874+
{$elseif defined(cpuarm)}
9875+
{$include arm.inc}
9876+
{$elseif defined(CPUX86_64)}
9877+
{$include x64.inc}
9878+
{$else}
9879+
{$fatal Pascal Script is not supported for your architecture at the moment!}
9880+
{$ifend}
9881+
{$ELSE}
9882+
{$include x86.inc}
9883+
{$ENDIF}
98779884
{$ENDIF}
9878-
{$endif}
98799885

98809886
type
98819887
PScriptMethodInfo = ^TScriptMethodInfo;

0 commit comments

Comments
 (0)