aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViljar Indus <indus@adacore.com>2024-07-22 12:10:51 +0300
committerMarc Poulhiès <dkm@gcc.gnu.org>2024-08-06 10:54:30 +0200
commitb25472f38da013d9a0575473db4522bc81d32781 (patch)
treefe065634108c896ff62ad1006b1a64b6424f6a58
parent439af1ef21d0d96b1f48d86e8c978e9af81490bc (diff)
downloadgcc-b25472f38da013d9a0575473db4522bc81d32781.zip
gcc-b25472f38da013d9a0575473db4522bc81d32781.tar.gz
gcc-b25472f38da013d9a0575473db4522bc81d32781.tar.bz2
ada: Use fully qualified in the runtime library
gcc/ada/ * libgnarl/s-taprop__mingw.adb: Use fully qualified names to avoid ambiguity. * libgnarl/s-taprop__posix.adb: Likewise. * libgnarl/s-taprop__qnx.adb: Likewise. * libgnarl/s-taprop__rtems.adb: Likewise.
-rw-r--r--gcc/ada/libgnarl/s-taprop__mingw.adb2
-rw-r--r--gcc/ada/libgnarl/s-taprop__posix.adb2
-rw-r--r--gcc/ada/libgnarl/s-taprop__qnx.adb16
-rw-r--r--gcc/ada/libgnarl/s-taprop__rtems.adb4
4 files changed, 12 insertions, 12 deletions
diff --git a/gcc/ada/libgnarl/s-taprop__mingw.adb b/gcc/ada/libgnarl/s-taprop__mingw.adb
index f77d719..8c7f59f 100644
--- a/gcc/ada/libgnarl/s-taprop__mingw.adb
+++ b/gcc/ada/libgnarl/s-taprop__mingw.adb
@@ -1035,7 +1035,7 @@ package body System.Task_Primitives.Operations is
-------------------
function RT_Resolution return Duration is
- Ticks_Per_Second : aliased LARGE_INTEGER;
+ Ticks_Per_Second : aliased System.OS_Interface.LARGE_INTEGER;
begin
QueryPerformanceFrequency (Ticks_Per_Second'Access);
return Duration (1.0 / Ticks_Per_Second);
diff --git a/gcc/ada/libgnarl/s-taprop__posix.adb b/gcc/ada/libgnarl/s-taprop__posix.adb
index fb70aaf..3d76679 100644
--- a/gcc/ada/libgnarl/s-taprop__posix.adb
+++ b/gcc/ada/libgnarl/s-taprop__posix.adb
@@ -209,7 +209,7 @@ package body System.Task_Primitives.Operations is
new Ada.Unchecked_Conversion (Task_Id, System.Address);
function GNAT_pthread_condattr_setup
- (attr : access pthread_condattr_t) return int;
+ (attr : access pthread_condattr_t) return Interfaces.C.int;
pragma Import (C,
GNAT_pthread_condattr_setup, "__gnat_pthread_condattr_setup");
diff --git a/gcc/ada/libgnarl/s-taprop__qnx.adb b/gcc/ada/libgnarl/s-taprop__qnx.adb
index f475c05..39e6983 100644
--- a/gcc/ada/libgnarl/s-taprop__qnx.adb
+++ b/gcc/ada/libgnarl/s-taprop__qnx.adb
@@ -119,7 +119,7 @@ package body System.Task_Primitives.Operations is
function Initialize_Lock
(L : not null access RTS_Lock;
- Prio : Any_Priority) return int;
+ Prio : Any_Priority) return Interfaces.C.int;
-- Initialize the lock L. If Ceiling_Support is True, then set the ceiling
-- to Prio. Returns 0 for success, or ENOMEM for out-of-memory.
@@ -220,7 +220,7 @@ package body System.Task_Primitives.Operations is
new Ada.Unchecked_Conversion (Task_Id, System.Address);
function GNAT_pthread_condattr_setup
- (attr : access pthread_condattr_t) return int;
+ (attr : access pthread_condattr_t) return Interfaces.C.int;
pragma Import (C,
GNAT_pthread_condattr_setup, "__gnat_pthread_condattr_setup");
@@ -333,11 +333,11 @@ package body System.Task_Primitives.Operations is
function Initialize_Lock
(L : not null access RTS_Lock;
- Prio : Any_Priority) return int
+ Prio : Any_Priority) return Interfaces.C.int
is
Attributes : aliased pthread_mutexattr_t;
- Result : int;
- Result_2 : aliased int;
+ Result : Interfaces.C.int;
+ Result_2 : aliased Interfaces.C.int;
begin
Result := pthread_mutexattr_init (Attributes'Access);
@@ -425,9 +425,9 @@ package body System.Task_Primitives.Operations is
(L : not null access Lock; Ceiling_Violation : out Boolean)
is
Self : constant pthread_t := pthread_self;
- Result : int;
- Policy : aliased int;
- Ceiling : aliased int;
+ Result : Interfaces.C.int;
+ Policy : aliased Interfaces.C.int;
+ Ceiling : aliased Interfaces.C.int;
Sched : aliased struct_sched_param;
begin
diff --git a/gcc/ada/libgnarl/s-taprop__rtems.adb b/gcc/ada/libgnarl/s-taprop__rtems.adb
index ea8422c..0a33c19 100644
--- a/gcc/ada/libgnarl/s-taprop__rtems.adb
+++ b/gcc/ada/libgnarl/s-taprop__rtems.adb
@@ -200,7 +200,7 @@ package body System.Task_Primitives.Operations is
new Ada.Unchecked_Conversion (Task_Id, System.Address);
function GNAT_pthread_condattr_setup
- (attr : access pthread_condattr_t) return int;
+ (attr : access pthread_condattr_t) return Interfaces.C.int;
pragma Import (C,
GNAT_pthread_condattr_setup, "__gnat_pthread_condattr_setup");
@@ -304,7 +304,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;