2008-04-08 Ed Schonberg <schonberg@adacore.com>

[pf3gnuchains/gcc-fork.git] / gcc / ada / switch.adb

diff --git a/gcc/ada/switch.adb b/gcc/ada/switch.adb
index fcbcbbb..bf32e64 100644 (file)
--- a/gcc/ada/switch.adb
+++ b/gcc/ada/switch.adb
@@ -10,14 +10,13 @@
 --                                                                          --
 -- 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- --
--- ware  Foundation;  either version 2,  or (at your option) any later ver- --
+-- ware  Foundation;  either version 3,  or (at your option) any later ver- --
 -- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
 -- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
 -- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License --
 -- for  more details.  You should have  received  a copy of the GNU General --
--- Public License  distributed with GNAT;  see file COPYING.  If not, write --
--- to  the  Free Software Foundation,  51  Franklin  Street,  Fifth  Floor, --
--- Boston, MA 02110-1301, USA.                                              --
+-- Public License  distributed with GNAT; see file COPYING3.  If not, go to --
+-- http://www.gnu.org/licenses for a complete copy of the license.          --
 --                                                                          --
 -- GNAT was originally developed  by the GNAT team at  New York University. --
 -- Extensive contributions were provided by Ada Core Technologies Inc.      --
@@ -43,14 +42,13 @@ package body Switch is
       Osint.Fail ("invalid switch: ", Switch);
    end Bad_Switch;
 
-   ----------------------------
-   -- Check_Version_And_Help --
-   ----------------------------
+   ------------------------------
+   -- Check_Version_And_Help_G --
+   ------------------------------
 
-   procedure Check_Version_And_Help
+   procedure Check_Version_And_Help_G
      (Tool_Name      : String;
       Initial_Year   : String;
-      Usage          : Procedure_Ptr;
       Version_String : String := Gnatvsn.Gnat_Version_String)
    is
       Version_Switch_Present : Boolean := False;
@@ -93,12 +91,12 @@ package body Switch is
 
       if Help_Switch_Present then
          Set_Standard_Output;
-         Usage.all;
+         Usage;
          Write_Eol;
          Write_Line ("Report bugs to report@adacore.com");
          Exit_Program (E_Success);
       end if;
-   end Check_Version_And_Help;
+   end Check_Version_And_Help_G;
 
    ---------------------
    -- Display_Version --