ChangeLog, resize2fs.c:

  Change blkcnt_t to be e2_blkcnt_t to avoid collision with the LFS API.

diff --git a/resize/ChangeLog b/resize/ChangeLog
index 1a632fb..fdd36c7 100644 (file)
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,8 @@
+1998-06-10  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * resize2fs.c (process_block): Change blkcnt_t to be e2_blkcnt_t
+               to avoid collision with LFS API.
+
 1998-04-28  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * extent.c (ext2fs_create_extent_table): Use ext2fs_free_mem

diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index 1818e02..7f0cffb 100644 (file)
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -858,7 +858,7 @@ struct process_block_struct {
 };
 
 static int process_block(ext2_filsys fs, blk_t *block_nr,
-                        blkcnt_t blockcnt, blk_t ref_block,
+                        e2_blkcnt_t blockcnt, blk_t ref_block,
                         int ref_offset, void *priv_data)
 {
        struct process_block_struct *pb;