diff options
| author | Theodore Ts'o <tytso@mit.edu> | 1998-06-10 20:36:37 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 1998-06-10 20:36:37 +0000 |
| commit | 084307590c5e28b6a8305933220ff5b2bd1bcda2 (patch) | |
| tree | a0ba121dbab8b4bfefcda6fb97ed0788c390f120 /resize | |
| parent | 4bf5fbfe055d5e9bce54a7bc2ad7b959041dcf12 (diff) | |
| download | e2fsprogs-084307590c5e28b6a8305933220ff5b2bd1bcda2.tar.gz | |
ChangeLog, resize2fs.c:
Change blkcnt_t to be e2_blkcnt_t to avoid collision with the LFS API.
Diffstat (limited to 'resize')
| -rw-r--r-- | resize/ChangeLog | 5 | ||||
| -rw-r--r-- | resize/resize2fs.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/resize/ChangeLog b/resize/ChangeLog index 1a632fbe..fdd36c76 100644 --- 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 1818e02c..7f0cffb2 100644 --- 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; |