From 4a19f057829a19d2e2504c590e4a327e68a8cdf8 Mon Sep 17 00:00:00 2001 From: ebotcazou Date: Fri, 29 Nov 2013 16:19:36 +0000 Subject: [PATCH] Backport revision 205532 from trunk PR ada/54040 PR ada/59346 * s-osinte-hpux.ads (timespec): Change type of tv_nsec field to time_t. * s-osinte-kfreebsd-gnu.ads (timespec): Likewise. * s-osinte-solaris-posix.ads (timespec): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@205532 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog.x32 | 8 ++++++++ gcc/ada/s-osinte-hpux.ads | 4 ++-- gcc/ada/s-osinte-kfreebsd-gnu.ads | 6 +++--- gcc/ada/s-osinte-solaris-posix.ads | 4 ++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gcc/ada/ChangeLog.x32 b/gcc/ada/ChangeLog.x32 index 9183bb7c886..1f6e6ab85b4 100644 --- a/gcc/ada/ChangeLog.x32 +++ b/gcc/ada/ChangeLog.x32 @@ -1,3 +1,11 @@ +2013-11-29 Eric Botcazou + + PR ada/54040 + PR ada/59346 + * s-osinte-hpux.ads (timespec): Change type of tv_nsec field to time_t. + * s-osinte-kfreebsd-gnu.ads (timespec): Likewise. + * s-osinte-solaris-posix.ads (timespec): Likewise. + 2013-11-19 H.J. Lu Backport from mainline diff --git a/gcc/ada/s-osinte-hpux.ads b/gcc/ada/s-osinte-hpux.ads index b916b8db940..396844c68a3 100644 --- a/gcc/ada/s-osinte-hpux.ads +++ b/gcc/ada/s-osinte-hpux.ads @@ -7,7 +7,7 @@ -- S p e c -- -- -- -- Copyright (C) 1991-1994, Florida State University -- --- Copyright (C) 1995-2012, Free Software Foundation, Inc. -- +-- Copyright (C) 1995-2013, 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- -- @@ -522,7 +522,7 @@ private type timespec is record tv_sec : time_t; - tv_nsec : long; + tv_nsec : time_t; end record; pragma Convention (C, timespec); diff --git a/gcc/ada/s-osinte-kfreebsd-gnu.ads b/gcc/ada/s-osinte-kfreebsd-gnu.ads index 406cf0bab27..f57fe9fea07 100644 --- a/gcc/ada/s-osinte-kfreebsd-gnu.ads +++ b/gcc/ada/s-osinte-kfreebsd-gnu.ads @@ -6,8 +6,8 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1991-1994, Florida State University -- --- Copyright (C) 1995-2005,2008,2012 Free Software Foundation, Inc. -- +-- Copyright (C) 1991-1994, Florida State University -- +-- Copyright (C) 1995-2013, 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- -- @@ -492,7 +492,7 @@ private type timespec is record tv_sec : time_t; - tv_nsec : long; + tv_nsec : time_t; end record; pragma Convention (C, timespec); diff --git a/gcc/ada/s-osinte-solaris-posix.ads b/gcc/ada/s-osinte-solaris-posix.ads index eb17bd4e25f..7aa20f11598 100644 --- a/gcc/ada/s-osinte-solaris-posix.ads +++ b/gcc/ada/s-osinte-solaris-posix.ads @@ -7,7 +7,7 @@ -- S p e c -- -- -- -- Copyright (C) 1991-1994, Florida State University -- --- Copyright (C) 1995-2011, Free Software Foundation, Inc. -- +-- Copyright (C) 1995-2013, 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- -- @@ -513,7 +513,7 @@ private type timespec is record tv_sec : time_t; - tv_nsec : long; + tv_nsec : time_t; end record; pragma Convention (C, timespec); -- 2.11.4.GIT