Mercurial > hg > octave-nkf > gnulib-hg
changeset 4986:cd55ad6d3cab
Merge from coreutils.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Wed, 31 Mar 2004 07:30:08 +0000 |
| parents | 41bd93f66780 |
| children | f33498f10f7d |
| files | lib/mountlist.c m4/ls-mntd-fs.m4 |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -1,5 +1,5 @@ /* mountlist.c -- return a list of mounted filesystems - Copyright (C) 1991, 1992, 1997-2003 Free Software Foundation, Inc. + Copyright (C) 1991, 1992, 1997-2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -53,6 +53,8 @@ #if defined MOUNTED_GETFSSTAT /* OSF_1 and Darwin1.3.x */ # if HAVE_SYS_UCRED_H +# include <grp.h> /* needed on OSF V4.0 for definition of NGROUPS, + NGROUPS is used as an array dimension in ucred.h */ # include <sys/ucred.h> /* needed by powerpc-apple-darwin1.3.7 */ # endif # if HAVE_SYS_MOUNT_H
--- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -1,4 +1,4 @@ -#serial 13 +#serial 14 dnl From Jim Meyering. dnl @@ -11,13 +11,19 @@ [ AC_CHECK_FUNCS(listmntent getmntinfo) AC_CHECK_HEADERS_ONCE(sys/param.h) -AC_CHECK_HEADERS(mntent.h sys/ucred.h sys/mount.h sys/fs_types.h) + +# We must include grp.h before ucred.h on OSF V4.0, since ucred.h uses +# NGROUPS (as the array dimension for a struct member) without a definition. +AC_CHECK_HEADERS(sys/ucred.h, [], [], [#include <grp.h>]) + +AC_CHECK_HEADERS(mntent.h sys/mount.h sys/fs_types.h) getfsstat_includes="\ $ac_includes_default #if HAVE_SYS_PARAM_H # include <sys/param.h> /* needed by powerpc-apple-darwin1.3.7 */ #endif #if HAVE_SYS_UCRED_H +# include <grp.h> /* needed for definition of NGROUPS */ # include <sys/ucred.h> /* needed by powerpc-apple-darwin1.3.7 */ #endif #if HAVE_SYS_MOUNT_H