[multiple changes]

2009-07-15  Sergey Rybin  <rybin@adacore.com>

	* tree_in.ads, tree_io.ads: Add pragma Warnings Off/On for with clause
	to System.OS_Lib to avoid warnings.

2009-07-15  Robert Dewar  <dewar@adacore.com>

	* sinfo.ads, make.adb, par.ads, par.adb, sem_warn.adb: Minor
	reformatting.

2009-07-15  Thomas Quinot  <quinot@adacore.com>

	* g-socthi-mingw.adb: Minor comment addition

	* g-socthi-mingw.ads (WSAStartup): First argument is a WORD not an int.

From-SVN: r149668

10 files changed, 61 insertions, 32 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d8fa823ba68..3c63782fd40 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,19 @@
+2009-07-15  Sergey Rybin  <rybin@adacore.com>
+
+	* tree_in.ads, tree_io.ads: Add pragma Warnings Off/On for with clause
+	to System.OS_Lib to avoid warnings.
+
+2009-07-15  Robert Dewar  <dewar@adacore.com>
+
+	* sinfo.ads, make.adb, par.ads, par.adb, sem_warn.adb: Minor
+	reformatting.
+
+2009-07-15  Thomas Quinot  <quinot@adacore.com>
+
+	* g-socthi-mingw.adb: Minor comment addition
+
+	* g-socthi-mingw.ads (WSAStartup): First argument is a WORD not an int.
+
 2009-07-15  Robert Dewar  <dewar@adacore.com>
 
 	* g-htable.ads, s-htable.ads: Minor reformatting
diff --git a/gcc/ada/g-socthi-mingw.adb b/gcc/ada/g-socthi-mingw.adb
index 7c0e7f6ef7f..49df16363b3 100644
--- a/gcc/ada/g-socthi-mingw.adb
+++ b/gcc/ada/g-socthi-mingw.adb
@@ -47,7 +47,9 @@ package body GNAT.Sockets.Thin is
 
    WSAData_Dummy : array (1 .. 512) of C.int;
 
-   WS_Version  : constant := 16#0202#;
+   WS_Version : constant := 16#0202#;
+   --  Winsock 2.2
+
    Initialized : Boolean := False;
 
    function Standard_Connect
diff --git a/gcc/ada/g-socthi-mingw.ads b/gcc/ada/g-socthi-mingw.ads
index 42783e5f734..8ec056148f1 100644
--- a/gcc/ada/g-socthi-mingw.ads
+++ b/gcc/ada/g-socthi-mingw.ads
@@ -191,7 +191,7 @@ package GNAT.Sockets.Thin is
      (Command : System.Address) return C.int;
 
    function WSAStartup
-     (WS_Version     : Interfaces.C.int;
+     (WS_Version     : Interfaces.C.unsigned_short;
       WSADataAddress : System.Address) return Interfaces.C.int;
 
    -------------------------------------------------------
diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb
index c1afc14e17d..1d96af98189 100644
--- a/gcc/ada/make.adb
+++ b/gcc/ada/make.adb
@@ -2979,7 +2979,9 @@ package body Make is
          Comp_Next := Comp_Next + 1;
 
          --  Optimize the simple case where the gcc command line looks like
-         --     gcc -c -I. ... -I- file.adb  --into->  gcc -c ... file.adb
+         --     gcc -c -I. ... -I- file.adb
+         --  into
+         --     gcc -c ... file.adb
 
          if Args (Args'First).all = "-I" & Normalized_CWD
            and then Args (Args'Last).all = "-I-"
diff --git a/gcc/ada/par.adb b/gcc/ada/par.adb
index a323d7ad8c7..51029d6b3f4 100644
--- a/gcc/ada/par.adb
+++ b/gcc/ada/par.adb
@@ -50,9 +50,7 @@ with Tbuild;   use Tbuild;
 -- Par --
 ---------
 
-function Par
-  (Configuration_Pragmas : Boolean) return List_Id
-is
+function Par (Configuration_Pragmas : Boolean) return List_Id is
    Num_Library_Units : Natural := 0;
    --  Count number of units parsed (relevant only in syntax check only mode,
    --  since in semantics check mode only a single unit is permitted anyway)
@@ -1345,8 +1343,8 @@ begin
                Operating_Mode := Save_Operating_Mode;
                Style_Check := Save_Style_Check;
 
-               --  If we are at an end of file, and not yet at the right
-               --  unit, then we have a fatal error. The unit is missing.
+               --  If we are at an end of file, and not yet at the right unit,
+               --  then we have a fatal error. The unit is missing.
 
                if Token = Tok_EOF then
                   Error_Msg_SC ("file has too few compilation units");
@@ -1354,9 +1352,9 @@ begin
                end if;
             end;
 
-         --  Here if we are not skipping a file in multiple unit per file
-         --  mode. Parse the unit that we are interested in. Note that in
-         --  check syntax mode we are interested in all units in the file.
+         --  Here if we are not skipping a file in multiple unit per file mode.
+         --  Parse the unit that we are interested in. Note that in check
+         --  syntax mode we are interested in all units in the file.
 
          else
             declare
@@ -1364,14 +1362,14 @@ begin
 
             begin
                --  If parsing was successful and we are not in check syntax
-               --  mode, check that language defined units are compiled in
-               --  GNAT mode. For this purpose we do NOT consider renamings
-               --  in annex J as predefined. That allows users to compile
-               --  their own versions of these files, and in particular,
-               --  in the VMS implementation, the DEC versions can be
-               --  substituted for the standard Ada 95 versions. Another
-               --  exception is System.RPC and its children. This allows
-               --  a user to supply their own communication layer.
+               --  mode, check that language defined units are compiled in GNAT
+               --  mode. For this purpose we do NOT consider renamings in annex
+               --  J as predefined. That allows users to compile their own
+               --  versions of these files, and in particular, in the VMS
+               --  implementation, the DEC versions can be substituted for the
+               --  standard Ada 95 versions. Another exception is System.RPC
+               --  and its children. This allows a user to supply their own
+               --  communication layer.
 
                if Comp_Unit_Node /= Error
                  and then Operating_Mode = Generate_Code
@@ -1385,9 +1383,8 @@ begin
                      Name  : String (1 .. Uname'Length - 2);
 
                   begin
-                     --  Because Unit_Name includes "%s" or "%b", we need to
-                     --  strip the last two characters to get the real unit
-                     --  name.
+                     --  Because Unit_Name includes "%s"/"%b", we need to strip
+                     --  the last two characters to get the real unit name.
 
                      Name := Uname (Uname'First .. Uname'Last - 2);
 
@@ -1447,8 +1444,8 @@ begin
          Restore_Opt_Config_Switches (Save_Config_Switches);
       end loop;
 
-      --  Now that we have completely parsed the source file, we can
-      --  complete the source file table entry.
+      --  Now that we have completely parsed the source file, we can complete
+      --  the source file table entry.
 
       Complete_Source_File_Entry;
 
diff --git a/gcc/ada/par.ads b/gcc/ada/par.ads
index cabc65b9e56..d3fc0e7303f 100644
--- a/gcc/ada/par.ads
+++ b/gcc/ada/par.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2007, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2009, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -28,8 +28,7 @@
 
 with Types; use Types;
 
-function Par
-  (Configuration_Pragmas : Boolean) return List_Id;
+function Par (Configuration_Pragmas : Boolean) return List_Id;
 --  Top level parsing routine. There are two cases:
 --
 --  If Configuration_Pragmas is False, Par parses a compilation unit in the
diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb
index 610baee2990..7ca0b864b4e 100644
--- a/gcc/ada/sem_warn.adb
+++ b/gcc/ada/sem_warn.adb
@@ -3356,8 +3356,8 @@ package body Sem_Warn is
    --  Start of processing for Warn_On_Known_Condition
 
    begin
-      --   Argument replacement in an inlined body can make conditions static.
-      --   Do not emit warnings in this case.
+      --  Argument replacement in an inlined body can make conditions static.
+      --  Do not emit warnings in this case.
 
       if In_Inlined_Body then
          return;
diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads
index 5f741077ce5..5ba4571f0b8 100644
--- a/gcc/ada/sinfo.ads
+++ b/gcc/ada/sinfo.ads
@@ -2175,7 +2175,7 @@ package Sinfo is
       --  Aliased_Present (Flag4) set if ALIASED appears
       --  Constant_Present (Flag17) set if CONSTANT appears
       --  Null_Exclusion_Present (Flag11)
-      --  Object_Definition (Node4) subtype indic./array type def./ access def.
+      --  Object_Definition (Node4) subtype indic./array type def./access def.
       --  Expression (Node3) (set to Empty if not present)
       --  Handler_List_Entry (Node2-Sem)
       --  Corresponding_Generic_Association (Node5-Sem)
diff --git a/gcc/ada/tree_in.ads b/gcc/ada/tree_in.ads
index d41ee4363b6..5fa0735d0e5 100644
--- a/gcc/ada/tree_in.ads
+++ b/gcc/ada/tree_in.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2009  Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2009, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -34,7 +34,13 @@
 --  tools that need to read the tree to the tree reading routines, and is
 --  thus bound as part of such tools.
 
+--  Note: the pragma Warnings (Off) here is because ASIS compiles this unit
+--  without -gnatg, and System.OS_Lib is an implementation unit. This is a
+--  temporary kludge which will be better resolved later on ???
+
+pragma Warnings (Off);
 with System.OS_Lib; use System.OS_Lib;
+pragma Warnings (On);
 
 procedure Tree_In (Desc : File_Descriptor);
 --  Desc is the file descriptor for the file containing the tree, as written
diff --git a/gcc/ada/tree_io.ads b/gcc/ada/tree_io.ads
index f5d4bff9cd2..c347b4f68fa 100644
--- a/gcc/ada/tree_io.ads
+++ b/gcc/ada/tree_io.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2009  Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2009, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -37,7 +37,14 @@
 with Types; use Types;
 
 with System;        use System;
+
+--  Note: the pragma Warnings (Off) here is because ASIS compiles this unit
+--  without -gnatg, and System.OS_Lib is an implementation unit. This is a
+--  temporary kludge which will be better resolved later on ???
+
+pragma Warnings (Off);
 with System.OS_Lib; use System.OS_Lib;
+pragma Warnings (On);
 
 package Tree_IO is