From: Jim Meyering <jim@meyering.net>
Date: Wed, 28 May 1997 11:42:29 +0000 (+0000)
Subject: (read_filesystem_list): Add `|| defined (__OpenBSD__)'
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f542a4ad63d3191b90d2340436f4042e61b18a8c;p=pspp

(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>
---

diff --git a/lib/mountlist.c b/lib/mountlist.c
index cc5edac3f1..de3e078c16 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);