fix an error that prevented compilation with more recent fpc

[lcore.git] / binipstuff.pas

diff --git a/binipstuff.pas b/binipstuff.pas
index 70ac40121308897df5c63a32cc77094b666611be..078e761f5751c29e87f93e8a1353d09068684947 100755 (executable)
--- a/binipstuff.pas
+++ b/binipstuff.pas
@@ -86,12 +86,18 @@ type
 \r
 \r
 \r
 \r
 \r
 \r

-    {$ifdef ipv6}\r
+  {$ifdef ipv6}\r

     {$ifdef ver1_0}\r
       cuint16=word;\r
       cuint32=dword;\r
       sa_family_t=word;\r
     {$ifdef ver1_0}\r
       cuint16=word;\r
       cuint32=dword;\r
       sa_family_t=word;\r

-\r
+\r      TInetSockAddr6 = packed record\r
+        sin6_family: word;\r
+        sin6_port: word;\r
+        sin6_flowinfo: uint32;\r
+        sin6_addr: tin6_addr;\r
+        sin6_scope_id: uint32;\r
+      end;\r

     {$endif}\r
   {$endif}\r
   TinetSockAddrv = packed record\r
     {$endif}\r
   {$endif}\r
   TinetSockAddrv = packed record\r


@@ -317,7 +323,7 @@ end;
 \r
 {\r
 IPv6 address binary to/from string conversion routines\r
 \r
 {\r
 IPv6 address binary to/from string conversion routines\r

-written by beware (steendijk at xs4all dot nl)\r
+written by beware\r

 \r
 - implementation does not depend on other ipv6 code such as the tin6_addr type,\r
   the parameter can also be untyped.\r
 \r
 - implementation does not depend on other ipv6 code such as the tin6_addr type,\r
   the parameter can also be untyped.\r


@@ -532,8 +538,11 @@ end;
 \r
 const\r
   biniplist_prefix='bipl'#0;\r
 \r
 const\r
   biniplist_prefix='bipl'#0;\r

-  biniplist_prefixlen=length(biniplist_prefix);\r
-\r
+  //fpc 1.0.x doesn't seem to like use of length function in a constant \r
+  //definition\r
+  //biniplist_prefixlen=length(biniplist_prefix);\r
+\r  biniplist_prefixlen=5;\r
+  \r

 function biniplist_new:tbiniplist;\r
 begin\r
   result := biniplist_prefix;\r
 function biniplist_new:tbiniplist;\r
 begin\r
   result := biniplist_prefix;\r