diff options
| author | Jim Meyering <jim@meyering.net> | 1997-05-28 11:42:29 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1997-05-28 11:42:29 +0000 |
| commit | 4354caa2d4cebde18798ce5f643a877f4292090b (patch) | |
| tree | d79a5a7c4bdf70c79b114cb5e9b7fdd217c07b9d | |
| parent | 106775512b4765f9d34afceee11b0cbb63924545 (diff) | |
| download | coreutils-4354caa2d4cebde18798ce5f643a877f4292090b.tar.xz | |
(read_filesystem_list): Add `|| defined (__OpenBSD__)'
to the NetBSD #if so OpenBSD also uses the f_fstypename member.
(fstype_to_string): Add `&& !defined (__OpenBSD__)' to the NetBSD #if
expression to exclude this function definition. OpenBSD 2.1 beta
doesn't need it. Patch from Hugh Daniel <hugh@ecotone.xanadu.com>
| -rw-r--r-- | lib/mountlist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mountlist.c b/lib/mountlist.c index cc5edac3f..de3e078c1 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -138,7 +138,7 @@ xatoi (cp) } #endif /* MOUNTED_GETMNTENT1. */ -#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) +#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) && !defined (__OpenBSD__) static char * fstype_to_string (t) short t; @@ -356,7 +356,7 @@ read_filesystem_list (need_fs_type, all_fs) me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); me->me_devname = xstrdup (fsp->f_mntfromname); me->me_mountdir = xstrdup (fsp->f_mntonname); -# ifdef __NetBSD__ +# if defined (__NetBSD__) || defined (__OpenBSD__) me->me_type = xstrdup (fsp->f_fstypename); # else me->me_type = fstype_to_string (fsp->f_type); |