fix compilation issue when using FPC 3.0.4

fanoframework · Feb 17, 2022 · 559e385 · 559e385
1 parent 351f140
commit 559e385
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/Libs/TermSignal/SigTermImpl.pas b/src/Libs/TermSignal/SigTermImpl.pas
@@ -67,6 +67,15 @@ implementation
         fpWrite(terminatePipeOut, ch, 1);
     end;
 
+    {$IF FPC_FULLVERSION <= 30004}
+    //workaround for bug 27414 in FPC 3.0.4
+    //https://gitlab.com/freepascal.org/fpc/source/-/issues/27414
+    procedure __doTerminate(sig : longint; info : PSigInfo; ctx : PSigContext); cdecl;
+    begin
+        TSigTerm.doTerminate(sig, info, ctx);
+    end;
+    {$ENDIF}
+
     (*!-----------------------------------------------
      * install signal handler
      *-------------------------------------------------
@@ -77,7 +86,11 @@ implementation
     begin
         fillChar(newAct, sizeOf(SigactionRec), #0);
         fillChar(oldAct, sizeOf(Sigactionrec), #0);
+        {$IF FPC_FULLVERSION <= 30004}
+        newAct.sa_handler := @__doTerminate;
+        {$ELSE}
         newAct.sa_handler := @TSigTerm.doTerminate;
+        {$ENDIF}
         fpSigaction(aSig, @newAct, @oldAct);
     end;
 

diff --git a/src/Router/NullRouteArgsImpl.pas b/src/Router/NullRouteArgsImpl.pas
@@ -77,7 +77,12 @@ implementation
      *--------------------------------------------*)
     function TNullRouteArgs.getArgs() : TArrayOfPlaceholders;
     begin
-        result := [];
+        //bugfix for FPC 3.0.4
+        {$IF FPC_FULLVERSION > 30004}
+            result := [];
+        {$ELSE}
+            result := nil;
+        {$ENDIF}
     end;
 
     (*!-------------------------------------------