From 55d7f3de15fc8b4b1bce5f23b962953a9d23211c Mon Sep 17 00:00:00 2001 From: jb Date: Fri, 4 Mar 2011 17:52:10 +0000 Subject: [PATCH] PR 47802 Hack to work around draft POSIX localtime_r git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170680 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgfortran/ChangeLog | 6 ++++++ libgfortran/intrinsics/ctime.c | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index a628fdd..73e2bb2 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2011-03-04 Janne Blomqvist + + PR libfortran/47802 + * intrinsics/ctime.c (strctime): Don't use return value of + localtime_r. + 2011-02-28 Jerry DeLisle PR libgfortran/47567 diff --git a/libgfortran/intrinsics/ctime.c b/libgfortran/intrinsics/ctime.c index 7eb10f5..29a0e6f 100644 --- a/libgfortran/intrinsics/ctime.c +++ b/libgfortran/intrinsics/ctime.c @@ -39,9 +39,13 @@ static size_t strctime (char *s, size_t max, const time_t *timep) { #ifdef HAVE_STRFTIME - struct tm res; - struct tm *ltm = localtime_r (timep, &res); - return strftime (s, max, "%c", ltm); + struct tm ltm; + /* Note: We can't use the return value of localtime_r, as some + targets provide localtime_r based on a draft of the POSIX + standard where the return type is int rather than the + standardized struct tm*. */ + localtime_r (timep, <m); + return strftime (s, max, "%c", <m); #else return 0; #endif -- 2.7.4