From b18a97e5dd0935e1c4a626c230f21457d0aad3d5 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Mon, 13 Sep 2021 19:49:49 +0200 Subject: Merged current trunk to branch. --- gcc/ada/adaint.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'gcc/ada/adaint.h') diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h index 85997b9..a63ceef 100644 --- a/gcc/ada/adaint.h +++ b/gcc/ada/adaint.h @@ -6,7 +6,7 @@ * * * C Header File * * * - * Copyright (C) 1992-2020, Free Software Foundation, Inc. * + * Copyright (C) 1992-2021, 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- * @@ -101,11 +101,7 @@ extern "C" { #endif /* Type corresponding to GNAT.OS_Lib.OS_Time */ -#if defined (_WIN64) typedef long long OS_Time; -#else -typedef long OS_Time; -#endif #define __int64 long long GNAT_STRUCT_STAT; @@ -205,7 +201,7 @@ extern OS_Time __gnat_file_time_name (char *); extern OS_Time __gnat_file_time_fd (int); /* return -1 in case of error */ -extern void __gnat_set_file_time_name (char *, time_t); +extern void __gnat_set_file_time_name (char *, OS_Time); extern int __gnat_dup (int); extern int __gnat_dup2 (int, int); -- cgit v1.1