diff options
author | Bruno Haible <bruno@clisp.org> | 2018-10-16 21:25:00 +0200 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2018-10-18 01:46:16 +0200 |
commit | e96dcbcbc5142bd04c6c2e9e4595d9bea910fb3b (patch) | |
tree | 0b1c69856a2b7423a3db669edb24125f100e5aea /m4 | |
parent | a2ae04a08f6da63181cbadfffab537f98d987d55 (diff) | |
download | gnulib-e96dcbcbc5142bd04c6c2e9e4595d9bea910fb3b.tar.gz |
fsusage, mountlist, getloadavg, getgroups: Remove support for Ultrix.
* m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Don't define
STAT_STATFS2_FS_DATA.
* lib/fsusage.c: Remove STAT_STATFS2_FS_DATA case.
* m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define
MOUNTED_GETMNT.
* lib/mountlist.c: Remove MOUNTED_GETMNT case.
* lib/getloadavg.c (decstation): Remove definition and case.
* m4/getgroups.m4 (AC_FUNC_GETGROUPS): Mention NeXTstep, not Ultrix.
* lib/getgroups.c: Likewise.
* doc/posix-functions/getgroups.texi: Likewise.
* lib/time.in.h: Update comments.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/fsusage.m4 | 35 | ||||
-rw-r--r-- | m4/getgroups.m4 | 4 | ||||
-rw-r--r-- | m4/ls-mntd-fs.m4 | 18 |
3 files changed, 2 insertions, 55 deletions
diff --git a/m4/fsusage.m4 b/m4/fsusage.m4 index 96378ba5f0..c3ba4391ae 100644 --- a/m4/fsusage.m4 +++ b/m4/fsusage.m4 @@ -263,41 +263,6 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1]; fi fi - if test $ac_fsusage_space = no; then - # Ultrix - AC_CACHE_CHECK([for two-argument statfs with struct fs_data (Ultrix)], - [fu_cv_sys_stat_fs_data], - [AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include <sys/types.h> -#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif -#ifdef HAVE_SYS_MOUNT_H -#include <sys/mount.h> -#endif -#ifdef HAVE_SYS_FS_TYPES_H -#include <sys/fs_types.h> -#endif - int - main () - { - struct fs_data fsd; - /* Ultrix's statfs returns 1 for success, - 0 for not mounted, -1 for failure. */ - return statfs (".", &fsd) != 1; - }]])], - [fu_cv_sys_stat_fs_data=yes], - [fu_cv_sys_stat_fs_data=no], - [fu_cv_sys_stat_fs_data=no]) - ]) - if test $fu_cv_sys_stat_fs_data = yes; then - ac_fsusage_space=yes - AC_DEFINE([STAT_STATFS2_FS_DATA], [1], - [Define if statfs takes 2 args and the second argument has - type struct fs_data. (Ultrix)]) - fi - fi - AS_IF([test $ac_fsusage_space = yes], [$1], [$2]) ]) diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 index d38240259f..8cddb6ccdc 100644 --- a/m4/getgroups.m4 +++ b/m4/getgroups.m4 @@ -1,4 +1,4 @@ -# serial 20 +# serial 21 dnl From Jim Meyering. dnl A wrapper around AC_FUNC_GETGROUPS. @@ -34,7 +34,7 @@ AC_DEFUN([AC_FUNC_GETGROUPS], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [AC_INCLUDES_DEFAULT], - [[/* On Ultrix 4.3, getgroups (0, 0) always fails. */ + [[/* On NeXTstep 3.2, getgroups (0, 0) always fails. */ return getgroups (0, 0) == -1;]]) ], [ac_cv_func_getgroups_works=yes], diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4 index 64a2dfcf78..7a4efcc9c8 100644 --- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -311,24 +311,6 @@ int getmntinfo (struct statfs **, int); fi if test -z "$ac_list_mounted_fs"; then - # (obsolete) Ultrix. - AC_CACHE_CHECK([for getmnt function], - [fu_cv_sys_mounted_getmnt], - [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ -#include <sys/fs_types.h> -#include <sys/mount.h>]])], - [fu_cv_sys_mounted_getmnt=yes], - [fu_cv_sys_mounted_getmnt=no]) - ]) - if test $fu_cv_sys_mounted_getmnt = yes; then - ac_list_mounted_fs=found - AC_DEFINE([MOUNTED_GETMNT], [1], - [Define if there is a function named getmnt for reading the list of - mounted file systems. (Ultrix)]) - fi - fi - - if test -z "$ac_list_mounted_fs"; then # Haiku, also (obsolete) BeOS. AC_CHECK_FUNCS([next_dev fs_stat_dev]) AC_CHECK_HEADERS([fs_info.h]) |