From 030ee52400a0efda7994727cabdd4ece91fcae95 Mon Sep 17 00:00:00 2001 From: Chao Yu Date: Fri, 18 Dec 2015 15:57:10 +0800 Subject: 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 Signed-off-by: Jaegeuk Kim --- include/f2fs_fs.h | 4 ++-- 1 file 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); -- cgit v1.2.3