diff options
| author | Chao Yu <chao2.yu@samsung.com> | 2015-12-18 15:57:10 +0800 |
|---|---|---|
| committer | Greg Wallace <greg@gregtwallace.com> | 2016-01-19 22:02:21 -0500 |
| commit | 030ee52400a0efda7994727cabdd4ece91fcae95 (patch) | |
| tree | e80a5be5d045972db1293a112385f695a7370dd0 | |
| parent | 09dfa9f0c722b024804f8961036411ce7f25641e (diff) | |
| download | android_external_f2fs-tools-030ee52400a0efda7994727cabdd4ece91fcae95.tar.gz android_external_f2fs-tools-030ee52400a0efda7994727cabdd4ece91fcae95.tar.bz2 android_external_f2fs-tools-030ee52400a0efda7994727cabdd4ece91fcae95.zip | |
libf2fs: fix incorrect type define of declaration
When compiling f2fs toolset in 32-bits machine, following error was
reported:
libf2fs.c:342:5: error: conflicting types for 'find_next_bit_le'
../include/f2fs_fs.h:864:22: note: previous declaration of 'find_next_bit_le' was here
libf2fs.c:348:5: error: conflicting types for 'find_next_zero_bit_le'
../include/f2fs_fs.h:865:22: note: previous declaration of 'find_next_zero_bit_le' was here
This is because our type of return value(u64 in define) and (unsigned long
in declaration) of find_next_{,zero_}bit_le were not same in non-64-bits
machine:
extern unsigned long find_next_bit_le(const u8 *, u64, u64);
u64 find_next_bit_le(const u8 *addr, u64 size, u64 offset)
Fix it.
Change-Id: I8c29735e4db1dce05ebc1b96f9ded87c55d02c63
Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | include/f2fs_fs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index 993edf2..d0727f9 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -886,8 +886,8 @@ extern int test_bit_le(u32, const u8 *); extern int f2fs_test_bit(unsigned int, const char *); extern int f2fs_set_bit(unsigned int, char *); extern int f2fs_clear_bit(unsigned int, char *); -extern unsigned long find_next_bit_le(const u8 *, u64, u64); -extern unsigned long find_next_zero_bit_le(const u8 *, u64, u64); +extern u64 find_next_bit_le(const u8 *, u64, u64); +extern u64 find_next_zero_bit_le(const u8 *, u64, u64); extern u_int32_t f2fs_cal_crc32(u_int32_t, void *, int); extern int f2fs_crc_valid(u_int32_t blk_crc, void *buf, int len); |