Merged revisions 6834 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r6834 | pierre | 2007-03-13 23:55:50 +0100 (Tue, 13 Mar 2007) | 1 line
  
   + allow to disable smartlinking if NO_SMART_LINK is defined
........

git-svn-id: branches/fixes_2_2@6945 -

rtl/win/winsock.pp

@@ -14,7 +14,9 @@
 
  **********************************************************************}
 
+{$ifndef NO_SMART_LINK}
 {$smartlink on}
+{$endif}
 unit winsock;
 
   interface

rtl/win/winsock2.pp

@@ -10,7 +10,9 @@
 
 unit WinSock2;
 
+{$ifndef NO_SMART_LINK}
 {$smartlink on}
+{$endif}
 
 interface
 
@@ -378,7 +380,7 @@ type
       2: (S_addr: u_long);
     end;
   in_addr = TInAddr;
-  
+
   PIn6Addr = ^TIn6Addr;
   TIn6Addr = record
     case byte of
@@ -402,7 +404,7 @@ type
           sa_data: array[0..13] of Char)
   end;
   sockaddr_in = TSockAddrIn;
-  
+
   PSockAddrIn6 = ^TSockAddrIn6;
   TSockAddrIn6 = record
     sin6_family   : u_short;