merge with 3.8.3e

diff --git a/lib/backupfile.c b/lib/backupfile.c
index ddf3fa7..cb94429 100644 (file)
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -156,11 +156,11 @@ max_backup_version (file, dir)
   int highest_version;
   int this_version;
   int file_name_length;
-  
+
   dirp = opendir (dir);
   if (!dirp)
     return 0;
-  
+
   highest_version = 0;
   file_name_length = strlen (file);
 
@@ -168,7 +168,7 @@ max_backup_version (file, dir)
     {
       if (!REAL_DIR_ENTRY (dp) || NLENGTH (dp) <= file_name_length)
        continue;
-      
+
       this_version = version_number (file, dp->d_name, file_name_length);
       if (this_version > highest_version)
        highest_version = this_version;
@@ -207,7 +207,7 @@ version_number (base, backup, base_length)
 {
   int version;
   char *p;
-  
+
   version = 0;
   if (!strncmp (base, backup, base_length) && ISDIGIT (backup[base_length]))
     {

diff --git a/lib/fsusage.c b/lib/fsusage.c
index 28c54ac..7f7a4a7 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -31,7 +31,7 @@
 
 int statfs ();
 
-#if defined (STATFS_OSF1)      /* DEC Alpha running OSF/1 */
+#if defined (STAT_STATFS3_OSF1)        /* DEC Alpha running OSF/1 */
 #  include <sys/mount.h>
 #endif
 
@@ -95,13 +95,13 @@ get_fs_usage (path, disk, fsp)
      char *path, *disk;
      struct fs_usage *fsp;
 {
-#if defined (STATFS_OSF1)
+#if defined (STAT_STATFS3_OSF1)
   struct statfs fsd;
 
   if (statfs (path, &fsd, sizeof (struct statfs)) != 0)
     return (-1);
 #define convert_blocks(b) adjust_blocks ((b),fsd.f_fsize, 512)
-#endif /* STATFS_OSF1 */
+#endif /* STAT_STATFS3_OSF1 */
 
 #ifdef STAT_STATFS2_FS_DATA    /* Ultrix.  */
   struct fs_data fsd;