[multiple changes]

[gcc.git] / gcc / ada / s-interr.ads

diff --git a/gcc/ada/s-interr.ads b/gcc/ada/s-interr.ads
index e927c334d2369e6f39a0ee3962689ef20e31c097..8e7362fd0419f9918df511fae1addd3922d3e942 100644 (file)
--- a/gcc/ada/s-interr.ads
+++ b/gcc/ada/s-interr.ads
@@ -6,8 +6,7 @@
 --                                                                          --
 --                                  S p e c                                 --
 --                                                                          --
---                                                                          --
---          Copyright (C) 1992-2001 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2004 Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNARL 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- --
@@ -27,9 +26,8 @@
 -- however invalidate  any other reasons why  the executable file  might be --
 -- covered by the  GNU Public License.                                      --
 --                                                                          --
--- GNARL was developed by the GNARL team at Florida State University. It is --
--- now maintained by Ada Core Technologies Inc. in cooperation with Florida --
--- State University (http://www.gnat.com).                                  --
+-- GNARL was developed by the GNARL team at Florida State University.       --
+-- Extensive contributions were provided by Ada Core Technologies, Inc.     --
 --                                                                          --
 ------------------------------------------------------------------------------
 
@@ -48,7 +46,7 @@
 --  tasking implementation to be linked and elaborated.
 
 with System.Tasking;
---  used for Task_ID
+--  used for Task_Id
 
 with System.Tasking.Protected_Objects.Entries;
 --  used for Protection_Entries
@@ -75,6 +73,12 @@ package System.Interrupts is
 
    type Interrupt_ID is range 0 .. System.OS_Interface.Max_Interrupt;
 
+   --  The following renaming is introduced so that the type is accessible
+   --  through rtsfind, otherwise the name clashes with its homonym in
+   --  ada.interrupts.
+
+   subtype System_Interrupt_Id is Interrupt_ID;
+
    type Parameterless_Handler is access protected procedure;
 
    ----------------------
@@ -127,11 +131,11 @@ package System.Interrupts is
    --  already attached will raise a Program_Error.
 
    procedure Bind_Interrupt_To_Entry
-     (T       : System.Tasking.Task_ID;
+     (T       : System.Tasking.Task_Id;
       E       : System.Tasking.Task_Entry_Index;
       Int_Ref : System.Address);
 
-   procedure Detach_Interrupt_Entries (T : System.Tasking.Task_ID);
+   procedure Detach_Interrupt_Entries (T : System.Tasking.Task_Id);
    --  This procedure detaches all the Interrupt Entries bound to a task.
 
    -------------------------------
@@ -147,7 +151,7 @@ package System.Interrupts is
 
    function Unblocked_By
      (Interrupt   : Interrupt_ID)
-      return System.Tasking.Task_ID;
+      return System.Tasking.Task_Id;
    --  It returns the ID of the last Task which Unblocked this Interrupt.
    --  It returns Null_Task if no tasks have ever requested the
    --  Unblocking operation or the Interrupt is currently Blocked.