diff mbox series

[COMMITTED,5/9] ada: Use fully qualified in more library files

Message ID 20240806090241.576862-5-poulhies@adacore.com
State Committed
Commit b9be798a007a824376dc2995684cbaeb523aac92
Headers
Series [COMMITTED,1/9] ada: Reject use-clause conflicts in the run-time library |

Commit Message

Marc Poulhiès Aug. 6, 2024, 9:02 a.m. UTC 
  From: Viljar Indus <indus@adacore.com>

gcc/ada/

	* libgnarl/s-interr__hwint.adb: Use fully qualified names to avoid
	ambiguity.
	* libgnarl/s-taprop__qnx.adb: Likewise.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/libgnarl/s-interr__hwint.adb | 11 ++++++-----
 gcc/ada/libgnarl/s-taprop__qnx.adb   |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/gcc/ada/libgnarl/s-interr__hwint.adb b/gcc/ada/libgnarl/s-interr__hwint.adb
index 12dde452ff4..0cccf6fd294 100644
--- a/gcc/ada/libgnarl/s-interr__hwint.adb
+++ b/gcc/ada/libgnarl/s-interr__hwint.adb
@@ -482,9 +482,10 @@  package body System.Interrupts is
       Handler   : System.OS_Interface.Interrupt_Handler)
    is
       Vec : constant Interrupt_Vector :=
-              Interrupt_Number_To_Vector (int (Interrupt));
+              Interrupt_Number_To_Vector
+                (Interfaces.C.int (Interrupt));
 
-      Status : int;
+      Status : Interfaces.C.int;
 
    begin
       --  Only install umbrella handler when no Ada handler has already been
@@ -613,7 +614,7 @@  package body System.Interrupts is
    procedure Notify_Interrupt (Param : System.Address) is
       Interrupt : constant Interrupt_ID := Interrupt_ID (Param);
       Id        : constant Binary_Semaphore_Id := Semaphore_ID_Map (Interrupt);
-      Status    : int;
+      Status    : Interfaces.C.int;
    begin
       if Id /= 0 then
          Status := Binary_Semaphore_Release (Id);
@@ -744,7 +745,7 @@  package body System.Interrupts is
       --------------------
 
       procedure Unbind_Handler (Interrupt : Interrupt_ID) is
-         Status : int;
+         Status : Interfaces.C.int;
 
       begin
          --  Flush server task off semaphore, allowing it to terminate
@@ -1024,7 +1025,7 @@  package body System.Interrupts is
       Tmp_Handler     : Parameterless_Handler;
       Tmp_ID          : Task_Id;
       Tmp_Entry_Index : Task_Entry_Index;
-      Status          : int;
+      Status          : Interfaces.C.int;
 
    begin
       Semaphore_ID_Map (Interrupt) := Int_Sema;
diff --git a/gcc/ada/libgnarl/s-taprop__qnx.adb b/gcc/ada/libgnarl/s-taprop__qnx.adb
index 39e6983f438..d6680b58dba 100644
--- a/gcc/ada/libgnarl/s-taprop__qnx.adb
+++ b/gcc/ada/libgnarl/s-taprop__qnx.adb
@@ -300,7 +300,7 @@  package body System.Task_Primitives.Operations is
          Res :=
            mprotect
              (Stack_Base - (Stack_Base mod Page_Size) + Page_Size,
-              size_t (Page_Size),
+              Interfaces.C.size_t (Page_Size),
               prot => (if On then PROT_ON else PROT_OFF));
          pragma Assert (Res = 0);
       end if;