Re: coreutils 5.93 on IRIX 5.3

[Paul Eggert]

address@hidden (Georg Schwarz) writes:

> cfe: Error: ./stat-time.h, line 93: Type struct timestruc  of returning
> expression is incompatible with type struct timespec  of function return
> type

I installed the following to fix that bug, in both gnulib and coreutils.

2005-12-07  Paul Eggert  <address@hidden>

        * lib/stat-time.h (STATE_TIMESPEC, STAT_TIMESPEC_NS): Add check for
        TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC, to fix IRIX 5.3
        porting problem reported by Georg Schwarz in
        <http://lists.gnu.org/archive/html/bug-coreutils/2005-12/msg00083.html>.
        * m4/stat-time.m4 (gl_STAT_TIME): Likewise.

--- lib/stat-time.h     17 Sep 2005 06:54:00 -0000      1.2
+++ lib/stat-time.h     7 Dec 2005 18:17:24 -0000
@@ -31,7 +31,11 @@
 
    These macros are private to stat-time.h.  */
 #if defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
-# define STAT_TIMESPEC(st, st_xtim) ((st)->st_xtim)
+# ifdef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC
+#  define STAT_TIMESPEC(st, st_xtim) ((st)->st_xtim)
+# else
+#  define STAT_TIMESPEC_NS(st, st_xtim) ((st)->st_xtim.tv_nsec)
+# endif
 #elif defined HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC
 # define STAT_TIMESPEC(st, st_xtim) ((st)->st_xtim##espec)
 #elif defined HAVE_STRUCT_STAT_ST_ATIMENSEC
--- m4/stat-time.m4     16 Sep 2005 06:52:15 -0000      1.1
+++ m4/stat-time.m4     7 Dec 2005 18:17:25 -0000
@@ -20,7 +20,36 @@ AC_DEFUN([gl_STAT_TIME],
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
-  AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec], [],
+  AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec],
+    [AC_CACHE_CHECK([whether struct stat.st_atim is of type struct timespec],
+       [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec],
+       [AC_TRY_COMPILE(
+         [
+           #include <sys/types.h>
+           #if TIME_WITH_SYS_TIME
+           # include <sys/time.h>
+           # include <time.h>
+           #else
+           # if HAVE_SYS_TIME_H
+           #  include <sys/time.h>
+           # else
+           #  include <time.h>
+           # endif
+           #endif
+           #include <sys/stat.h>
+           struct timespec ts;
+           struct stat st;
+         ],
+         [
+           st.st_atim = ts;
+         ],
+         [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=yes],
+         [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no])])
+     if test $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec = yes; then
+       AC_DEFINE([TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC], 1,
+         [Define to 1 if the type of the st_atim member of a struct stat is
+         struct timespec.])
+     fi],
     [AC_CHECK_MEMBERS([struct stat.st_atimespec.tv_nsec], [],
        [AC_CHECK_MEMBERS([struct stat.st_atimensec], [],
          [AC_CHECK_MEMBERS([struct stat.st_atim.st__tim.tv_nsec], [],