X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/9a44a542cab11c03215fe3c844dde2529a87258d..803cf6668d9e89c244e5fbc7f996a460470338dd:/unixstuff.inc?ds=sidebyside

diff --git a/unixstuff.inc b/unixstuff.inc
old mode 100755
new mode 100644
index b522c74..ae615ff
--- a/unixstuff.inc
+++ b/unixstuff.inc
@@ -43,11 +43,22 @@
     {$ifndef ver1_9_2}
       {$define flock     := fpflock}
       {$ifndef ver1_9_4}
-        procedure Execl(Todo:string);inline;
+        //beware: this is needed because FPC_FULLVERSION >= 30200 breaks delphi 6 even inside an ifdef it shouldn't process
+        {$ifdef fpc}
+          {$ifdef ver3}
+            {$ifndef ver3_0}{$ifndef ver3_1}{$define fpc_3_2_or_later}{$endif}{$endif}
+          {$endif}
+          {$ifdef ver4}{$define fpc_3_2_or_later}{$endif}
+        {$endif}
+        {$ifdef fpc_3_2_or_later}
+          procedure Execl(Todo:rawbytestring);inline;
+        {$else}
+          procedure Execl(Todo:string);inline;
+        {$endif}
 	var
 	  p : ppchar;
 	begin
-	  p := unixutil.StringToPPChar(Todo,1);
+	  p := unixutil.StringToPPChar(Todo,0);
 	  if (p=nil) or (p^=nil) then exit;
 	  fpexecv(p^,p);
 	end;
@@ -114,9 +125,9 @@
       end;
       {$define need_v6constants}
     {$endif}
-    procedure gettimeofday(var tv:ttimeval);inline;
+    function gettimeofday(var tv:ttimeval):integer; inline;
     begin
-      fpgettimeofday(@tv,nil);    
+      result := fpgettimeofday(@tv,nil);
     end;
     function gettimeofdaysec : longint;
     var
@@ -168,4 +179,4 @@
 
 {$endif}
 
-    
\ No newline at end of file
+