ifdef mswindows instead of win32 for 64 bits support

[lcore.git] / binipstuff.pas

diff --git a/binipstuff.pas b/binipstuff.pas
index 94a0c03b621108e54f0516998fc08d87aa7cdb7b..93363e2b28282d8068260164ebade1cb50cf5003 100644 (file)
--- a/binipstuff.pas
+++ b/binipstuff.pas
@@ -4,27 +4,28 @@
   ----------------------------------------------------------------------------- }\r
 unit binipstuff;\r
 \r
   ----------------------------------------------------------------------------- }\r
 unit binipstuff;\r
 \r

+{$ifdef fpc}\r
+{$mode delphi}\r
+{$endif}\r
+\r

 interface\r
 \r
 {$include lcoreconfig.inc}\r
 \r
 uses\r
 interface\r
 \r
 {$include lcoreconfig.inc}\r
 \r
 uses\r

-{$ifndef win32}\r
+{$ifndef mswindows}\r

   sockets,\r
 {$endif}\r
   pgtypes;\r
 \r
   sockets,\r
 {$endif}\r
   pgtypes;\r
 \r

-{$ifdef fpc}\r
-  {$mode delphi}\r
-{$endif}\r
-{$ifdef cpu386}{$define i386}{$endif}\r
-{$ifdef i386}{$define ENDIAN_LITTLE}{$endif}\r
+\r
+{$include pgtypes.inc}\r

 \r
 {$include uint32.inc}\r
 \r
 const\r
   hexchars:array[0..15] of ansichar='0123456789abcdef';\r
 \r
 {$include uint32.inc}\r
 \r
 const\r
   hexchars:array[0..15] of ansichar='0123456789abcdef';\r

-  {$ifdef win32}\r
+  {$ifdef mswindows}\r

     AF_INET=2;\r
     AF_INET6=23;\r
   {$else}\r
     AF_INET=2;\r
     AF_INET6=23;\r
   {$else}\r


@@ -38,7 +39,7 @@ const
 type\r
   {$ifdef ipv6}\r
     \r
 type\r
   {$ifdef ipv6}\r
     \r

-    {$ifdef win32}\r
+    {$ifdef mswindows}\r

       {$define want_Tin6_addr}\r
     {$endif}\r
     {$ifdef ver1_0}\r
       {$define want_Tin6_addr}\r
     {$endif}\r
     {$ifdef ver1_0}\r


@@ -69,7 +70,7 @@ type
     {$endif}\r
   end;\r
 \r
     {$endif}\r
   end;\r
 \r

-  {$ifdef win32}\r
+  {$ifdef mswindows}\r

     TInetSockAddr = packed Record\r
       family:Word;\r
       port  :Word;\r
     TInetSockAddr = packed Record\r
       family:Word;\r
       port  :Word;\r


@@ -384,6 +385,13 @@ begin
       end;\r
     end;\r
   end;\r
       end;\r
     end;\r
   end;\r

+\r
+  {run length atleast 2 0 words}\r
+  if (runlength = 1) then begin\r
+    runlength := 0;\r
+    runbegin := 0;\r
+  end;\r
+\r

   result := '';\r
   for a := 0 to runbegin-1 do begin\r
     if (a <> 0) then result := result + ':';\r
   result := '';\r
   for a := 0 to runbegin-1 do begin\r
     if (a <> 0) then result := result + ':';\r