From: Bruno Haible Date: Tue, 16 Oct 2018 18:47:03 +0000 (+0200) Subject: fsusage: Remove support for AIX 3. X-Git-Tag: v1.0~5333 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=8ae091f7c8cd35cc7dff82c544d04da6fd095e11;p=gnulib.git fsusage: Remove support for AIX 3. * lib/fsusage.c: Remove code for AIX 3. * m4/fsusage.m4 (gl_PREREQ_FSUSAGE_EXTRA): Update comments. --- diff --git a/ChangeLog b/ChangeLog index 21127ecb98..6411e72442 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-10-16 Bruno Haible + + fsusage: Remove support for AIX 3. + * lib/fsusage.c: Remove code for AIX 3. + * m4/fsusage.m4 (gl_PREREQ_FSUSAGE_EXTRA): Update comments. + 2018-10-16 Bruno Haible fsusage, stat-size, getloadavg: Remove support for AIX PS/2. diff --git a/lib/fsusage.c b/lib/fsusage.c index 8431f20806..2a690220e3 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -216,9 +216,9 @@ 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 !_AIX && !defined _SEQUENT_ +# if !defined _SEQUENT_ # define f_bavail f_bfree # endif @@ -230,7 +230,7 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp) /* Empirically, the block counts on most SVR3 and SVR3-derived systems seem to always be in terms of 512-byte blocks, no matter what value f_bsize has. */ -# if _AIX || defined _CRAY +# if defined _CRAY fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize); # else fsp->fsu_blocksize = 512; diff --git a/m4/fsusage.m4 b/m4/fsusage.m4 index 6f6e9cd48b..56ac473832 100644 --- a/m4/fsusage.m4 +++ b/m4/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 @@ -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