PR 47802 Use builtins to check localtime_r return type

From-SVN: r170683

2 files changed, 14 insertions, 3 deletions

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 73e2bb2..33e2836 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,6 +1,12 @@
 2011-03-04  Janne Blomqvist  <jb@gcc.gnu.org>
 
 	PR libfortran/47802
+	* intrinsics/ctime.c (strctime): Use builtins to check localtime_r
+	return type.
+
+2011-03-04  Janne Blomqvist  <jb@gcc.gnu.org>
+
+	PR libfortran/47802
 	* intrinsics/ctime.c (strctime): Don't use return value of
 	localtime_r.
 
diff --git a/libgfortran/intrinsics/ctime.c b/libgfortran/intrinsics/ctime.c
index 29a0e6f..92c0431 100644
--- a/libgfortran/intrinsics/ctime.c
+++ b/libgfortran/intrinsics/ctime.c
@@ -40,11 +40,16 @@ strctime (char *s, size_t max, const time_t *timep)
 {
 #ifdef HAVE_STRFTIME
   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
+  int failed;
+  /* Some targets provide a 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, &ltm);
+  __builtin_choose_expr (__builtin_classify_type (localtime_r (timep, &ltm)) 
+			 == 5,
+			 failed = localtime_r (timep, &ltm) == NULL,
+			 failed = localtime_r (timep, &ltm) != 0);
+  if (failed)
+    return 0;
   return strftime (s, max, "%c", &ltm);
 #else
   return 0;