merge with 3.5.5

diff --git a/lib/fsusage.c b/lib/fsusage.c
index 2a1fe86c75d5f93571f2f1b501626af53bcd4a24..c9ed26c878c23618f565367c8ba70a8bf85ffc1a 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -156,9 +156,11 @@ get_fs_usage (path, disk, fsp)
      no matter what value f_bsize has.  */
 #define convert_blocks(b) (b)
 #ifndef _SEQUENT_              /* _SEQUENT_ is DYNIX/ptx.  */
+#ifndef DOLPHIN                        /* DOLPHIN 3.8.alfa/7.18 has f_bavail */
 #define f_bavail f_bfree
 #endif
 #endif
+#endif
 
 #ifdef STAT_STATVFS            /* SVR4.  */
   struct statvfs fsd;