diff options
| author | Benoît Dejean <bdejean@src.gnome.org> | 2004-08-22 19:30:14 +0000 |
|---|---|---|
| committer | Benoît Dejean <bdejean@src.gnome.org> | 2004-08-22 19:30:14 +0000 |
| commit | ef95ef85ff11047474d6dfb423a59fd5c82bc32e (patch) | |
| tree | f3def6bedd8526739e119d01d6d890b2692a43e3 | |
| parent | ff160fa9f3992b744b07511819790f6b3964a43c (diff) | |
| download | libgtop-ef95ef85ff11047474d6dfb423a59fd5c82bc32e.tar.gz | |
Merged FreeBSD Marcus' patch.
* mountlist.c: (read_filesystem_list): Merged FreeBSD Marcus' patch.
| -rw-r--r-- | sysdeps/common/ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/common/mountlist.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sysdeps/common/ChangeLog b/sysdeps/common/ChangeLog index 3326f39a..ad6c9da6 100644 --- a/sysdeps/common/ChangeLog +++ b/sysdeps/common/ChangeLog @@ -1,3 +1,7 @@ +2004-08-22 Benoît Dejean <tazforever@dlfp.org> + + * mountlist.c: (read_filesystem_list): Merged FreeBSD Marcus' patch. + 2004-07-17 Benoît Dejean <tazforever@dlfp.org> * fsusage.c: (glibtop_get_fsusage_s): Started implementation of read, write. diff --git a/sysdeps/common/mountlist.c b/sysdeps/common/mountlist.c index 736748da..2b769843 100644 --- a/sysdeps/common/mountlist.c +++ b/sysdeps/common/mountlist.c @@ -95,7 +95,7 @@ static struct mount_entry *read_filesystem_list (gboolean need_fs_type); #endif -#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) && !defined (__OpenBSD__) +#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) && !defined (__OpenBSD__) && !defined(__FreeBSD__) static const char * fstype_to_string (short t) { @@ -300,7 +300,7 @@ read_filesystem_list (gboolean need_fs_type) me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry)); me->me_devname = g_strdup (fsp->f_mntfromname); me->me_mountdir = g_strdup (fsp->f_mntonname); -#if defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) me->me_type = g_strdup (fsp->f_fstypename); #else me->me_type = g_strdup (fstype_to_string (fsp->f_type)); |