Corrected binipstuff error with merge

git-svn-id: file:///svnroot/lcore/trunk@80 b1de8a11-f9be-4011-bde0-cc7ace90066a

diff --git a/binipstuff.pas b/binipstuff.pas
index ae3d23a87da1437554b865b6b22ef25550b71358..7c6fc892039f059b92f98ddd0e937be68bfce154 100644 (file)
--- a/binipstuff.pas
+++ b/binipstuff.pas
@@ -8,9 +8,9 @@ interface
 \r
 {$include lcoreconfig.inc}\r
 \r
 \r
 {$include lcoreconfig.inc}\r
 \r

-uses\r
-  {$ifndef win32}{$ifdef ipv6}sockets,{$endif}{$endif}\r
-  pgtypes;\r
+{$ifndef win32}\r
+uses sockets;\r
+{$endif}\r

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