Merged revisions 1665,1682 via svnmerge from

http://[email protected]/svn/fpc/trunk

........
r1665 | marco | 2005-11-05 20:49:10 +0100 (Sat, 05 Nov 2005) | 2 lines

 * small but significant typo fixed for ipv6 sockaddr record in BSD style (_WITH_ sinlen)

........
r1682 | florian | 2005-11-06 21:09:28 +0100 (Sun, 06 Nov 2005) | 2 lines

+ warn directive is different fom warnings and warning

........

git-svn-id: branches/fixes_2_0@1689 -

compiler/scandir.pas

@@ -1032,6 +1032,23 @@ implementation
           status.verbosity:=status.verbosity and (not V_Info);
       end;
 
+    procedure dir_warn;
+      var
+        warning_string,state : string;
+      begin
+        current_scanner.skipspace;
+        warning_string:=current_scanner.readid;
+        if (upper(warning_string)='ON') then
+          begin
+          end
+        else if (upper(warning_string)='ON') then
+          else
+            begin
+              current_scanner.skipspace;
+              state:=current_scanner.readid;
+            end;
+      end;
+
     procedure dir_warning;
       begin
         do_message(scan_w_user_defined);
@@ -1207,7 +1224,7 @@ implementation
         AddDirective('VARSTRINGCHECKS',directive_all, @dir_varstringchecks);
         AddDirective('VERSION',directive_all, @dir_version);
         AddDirective('WAIT',directive_all, @dir_wait);
-        AddDirective('WARN',directive_all, @dir_warnings);
+        AddDirective('WARN',directive_all, @dir_warn);
         AddDirective('WARNING',directive_all, @dir_warning);
         AddDirective('WARNINGS',directive_all, @dir_warnings);
         AddDirective('WEAKPACKAGEUNIT',directive_all, @dir_weakpackageunit);

rtl/inc/socketsh.inc

@@ -134,7 +134,7 @@ Type
   pIn6_Addr=^TIn6_addr;
 
   TInetSockAddr6 = packed Record
-    {$ifdef SOCKET_HAS_SINLEN}  // as per RFC 2553
+    {$ifdef SOCK_HAS_SINLEN}  // as per RFC 2553
       sin6_len    : byte;
     {$endif}
     sin6_family   : sa_family_t;