Sync with gnulib 8ae091f7c8cd35cc7dff82c544d04da6fd095e11.

Remove support for AIX 3. * m4.include/gnulib/fsusage.m4 (gl_PREREQ_FSUSAGE_EXTRA): Update comments. * src/filemanager/mountlist.c: Likewise. * doc/FAQ: Update OS list. Signed-off-by: Andrew Borodin <[email protected]>
davidklika · Nov 24, 2018 · 0f3d0ea · 0f3d0ea
1 parent 792d25a
commit 0f3d0ea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/doc/FAQ b/doc/FAQ
@@ -128,7 +128,6 @@ Frequently Asked Questions
      * sparc64-linux-linux2.1
      * mips-sgi-irix5.x, 6.x
      * mips-dec-ultrix4.3
-     * rs6000-ibm-aix3.2.5
      * sparc-sun-sunos4.1
      * sparc-sun-solaris2.3, 2.4, 2.5
      * sparc-sun-netbsd1.0

diff --git a/m4.include/gnulib/fsusage.m4 b/m4.include/gnulib/fsusage.m4
@@ -206,7 +206,7 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1];
   if test $ac_fsusage_space = no; then
     # SVR3
     # (Solaris already handled above.)
-    AC_CACHE_CHECK([for four-argument statfs (AIX-3.2.5, SVR3)],
+    AC_CACHE_CHECK([for four-argument statfs (SVR3)],
       [fu_cv_sys_stat_statfs4],
       [AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>
@@ -224,7 +224,7 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1];
     if test $fu_cv_sys_stat_statfs4 = yes; then
       ac_fsusage_space=yes
       AC_DEFINE([STAT_STATFS4], [1],
-        [Define if statfs takes 4 args.  (SVR3, Dynix, old Irix, old AIX)])
+        [Define if statfs takes 4 args.  (SVR3, Dynix, old Irix)])
     fi
   fi
 

diff --git a/src/filemanager/mountlist.c b/src/filemanager/mountlist.c
@@ -1489,7 +1489,7 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
 
         fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
 
-#elif defined STAT_STATFS4      /* SVR3, Dynix, old Irix, old AIX */
+#elif defined STAT_STATFS4      /* SVR3, Dynix, old Irix */
 
 #if !defined _SEQUENT_
 #define f_bavail f_bfree