FreeBSD support

[lcore.git] / unixstuff.inc

diff --git a/unixstuff.inc b/unixstuff.inc
old mode 100755 (executable)
new mode 100644 (file)
index dca63ce..ae615ff
--- a/unixstuff.inc
+++ b/unixstuff.inc
@@ -43,7 +43,18 @@
     {$ifndef ver1_9_2}\r
       {$define flock     := fpflock}\r
       {$ifndef ver1_9_4}\r
     {$ifndef ver1_9_2}\r
       {$define flock     := fpflock}\r
       {$ifndef ver1_9_4}\r

-        procedure Execl(Todo:string);inline;\r
+        //beware: this is needed because FPC_FULLVERSION >= 30200 breaks delphi 6 even inside an ifdef it shouldn't process\r
+        {$ifdef fpc}\r
+          {$ifdef ver3}\r
+            {$ifndef ver3_0}{$ifndef ver3_1}{$define fpc_3_2_or_later}{$endif}{$endif}\r
+          {$endif}\r
+          {$ifdef ver4}{$define fpc_3_2_or_later}{$endif}\r
+        {$endif}\r
+        {$ifdef fpc_3_2_or_later}\r
+          procedure Execl(Todo:rawbytestring);inline;\r
+        {$else}\r
+          procedure Execl(Todo:string);inline;\r
+        {$endif}\r

        var\r
          p : ppchar;\r
        begin\r
        var\r
          p : ppchar;\r
        begin\r


@@ -114,9 +125,9 @@
       end;\r
       {$define need_v6constants}\r
     {$endif}\r
       end;\r
       {$define need_v6constants}\r
     {$endif}\r

-    procedure gettimeofday(var tv:ttimeval);inline;\r
+    function gettimeofday(var tv:ttimeval):integer; inline;\r

     begin\r
     begin\r

-      fpgettimeofday(@tv,nil);    \r
+      result := fpgettimeofday(@tv,nil);\r

     end;\r
     function gettimeofdaysec : longint;\r
     var\r
     end;\r
     function gettimeofdaysec : longint;\r
     var\r