Merge branch 'master' of https://github.com/danieleteti/delphimvcfram…

…ework
danieleteti · Apr 17, 2024 · 739b751 · 739b751
2 parents 65fa22e + eba712e
commit 739b751
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sources/MVCFramework.RQL.Parser.pas b/sources/MVCFramework.RQL.Parser.pas
@@ -315,7 +315,7 @@ procedure TRQL2SQL.Error(const Message: string);
   end;
   if lMsg.Trim.IsEmpty then
     lMsg := '<EOF>';
-  raise ERQLException.CreateFmt('[Error] %s (column %d - found %s)', [message, fCurIdx, lMsg]) at AddressOfReturnAddress;
+  raise ERQLException.CreateFmt('[Error] %s (column %d - found %s)', [message, fCurIdx, lMsg]){$IF DEFINED(MSWINDOWS)} at AddressOfReturnAddress{$ENDIF};
 end;
 
 procedure TRQL2SQL.Execute(

diff --git a/sources/MVCFramework.pas b/sources/MVCFramework.pas
@@ -2615,7 +2615,7 @@ function TMVCEngine.CreateControllerWithDependencies(
     for I := 0 to Length(lActionFormalParams) - 1 do
     begin
       lServiceName := '';
-      {$IF Defined(SYDNEYORBETTER)}
+      {$IF Defined(ALEXANDRIAORBETTER)}
       lInjectAttribute := lActionFormalParams[I].GetAttribute<MVCInjectAttribute>;
       {$ELSE}
       lInjectAttribute := TRttiUtils.GetAttribute<MVCInjectAttribute>(lActionFormalParams[I]);