* haifa-sched.c (extend_global): Split to extend_global_data and

[pf3gnuchains/gcc-fork.git] / gcc / ada / sinput-c.adb

diff --git a/gcc/ada/sinput-c.adb b/gcc/ada/sinput-c.adb
index 370429a..86eff4a 100644 (file)
--- a/gcc/ada/sinput-c.adb
+++ b/gcc/ada/sinput-c.adb
@@ -6,30 +6,29 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2004 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2007, 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- --
--- 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,  59 Temple Place - Suite 330,  Boston, --
--- MA 02111-1307, 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.      --
 --                                                                          --
 ------------------------------------------------------------------------------
 
+with Opt;    use Opt;
+with System; use System;
+
 with Ada.Unchecked_Conversion;
 
-with GNAT.OS_Lib; use GNAT.OS_Lib;
-with Namet;       use Namet;
-with Opt;         use Opt;
-with System;      use System;
+with System.OS_Lib; use System.OS_Lib;
 
 package body Sinput.C is
 
@@ -52,8 +51,8 @@ package body Sinput.C is
 
       Actual_Len : Integer;
 
-      Path_Id : Name_Id;
-      File_Id : Name_Id;
+      Path_Id : File_Name_Type;
+      File_Id : File_Name_Type;
 
    begin
       if Path = "" then
@@ -103,7 +102,7 @@ package body Sinput.C is
          type Actual_Source_Ptr is access Actual_Source_Buffer;
          --  This is the pointer type for the physical buffer allocated
 
-         Actual_Ptr : Actual_Source_Ptr := new Actual_Source_Buffer;
+         Actual_Ptr : constant Actual_Source_Ptr := new Actual_Source_Buffer;
          --  And this is the actual physical buffer
 
       begin
@@ -193,6 +192,7 @@ package body Sinput.C is
                Source_Last         => Hi,
                Source_Text         => Src,
                Template            => No_Source_File,
+               Unit                => No_Unit,
                Time_Stamp          => Empty_Time_Stamp);
 
          Alloc_Line_Tables (S, Opt.Table_Factor * Alloc.Lines_Initial);