make dnsasync better handle cleanup of a partially constructed instance

[lcore.git] / unixstuff.inc

diff --git a/unixstuff.inc b/unixstuff.inc
index 76a7f5211d4aab92429f92def57133de937f1995..89c96f2ce84c6615939eb2b4e6779d9668d581e1 100755 (executable)
--- a/unixstuff.inc
+++ b/unixstuff.inc
@@ -8,6 +8,21 @@
       linux.dup(original,result);\r
     end;\r
     {$define gettimeofdaysec := gettimeofday}\r
       linux.dup(original,result);\r
     end;\r
     {$define gettimeofdaysec := gettimeofday}\r

+    const\r
+      IPPROTO_UDP=17;\r
+      IPPROTO_ICMP=1;\r
+    function ntohs(invalue:word):word;inline;\r
+    var\r
+      invaluebytes : array[0..1] of byte absolute invalue;\r
+      resultbytes : array[0..1] of byte absolute result;\r
+    begin\r
+      {$ifdef endian_little}\r
+       resultbytes[0] := invaluebytes[1];\r
+       resultbytes[1] := invaluebytes[0];\r
+      {$else}\r
+       result := invalue;\r
+      {$endif}\r
+    end;  \r

   {$else}\r
     \r
     {$define sigprocmask := fpsigprocmask}\r
   {$else}\r
     \r
     {$define sigprocmask := fpsigprocmask}\r


@@ -26,16 +41,38 @@
     {$define dup2        := fpdup2}\r
     {$ifndef ver1_9_2}\r
       {$define flock     := fpflock}\r
     {$define dup2        := fpdup2}\r
     {$ifndef ver1_9_2}\r
       {$define flock     := fpflock}\r

-      {$ifndef ver1_9_4}
-        procedure Execl(Todo:string);inline;
-       var
-         p : ppchar;
-       begin
-         p := unixutil.StringToPPChar(Todo,1);
-         if (p=nil) or (p^=nil) then exit;
-         fpexecv(p^,p);
-       end;
-      {$endif}
+      {$ifndef ver1_9_4}\r
+        procedure Execl(Todo:string);inline;\r
+       var\r
+         p : ppchar;\r
+       begin\r
+         p := unixutil.StringToPPChar(Todo,1);\r
+         if (p=nil) or (p^=nil) then exit;\r
+         fpexecv(p^,p);\r
+       end;\r
+      {$endif}\r
+    {$endif}\r
+    {$ifdef ver2_0}\r
+      const\r
+        IPPROTO_UDP=17;\r
+        IPPROTO_ICMP=1;\r
+    {$endif}\r
+    {$ifdef ver1_9}\r
+      const\r
+        IPPROTO_UDP=17;\r
+        IPPROTO_ICMP=1;\r
+      function ntohs(invalue:word):word;inline;\r
+      var\r
+        invaluebytes : array[0..1] of byte absolute invalue;\r
+       resultbytes : array[0..1] of byte absolute result;\r
+      begin\r
+        {$ifdef endian_little}\r
+         resultbytes[0] := invaluebytes[1];\r
+         resultbytes[1] := invaluebytes[0];\r
+       {$else}\r
+         result := invalue;\r
+       {$endif}\r
+      end;\r

     {$endif}\r
     procedure gettimeofday(var tv:ttimeval);inline;\r
     begin\r
     {$endif}\r
     procedure gettimeofday(var tv:ttimeval);inline;\r
     begin\r