diff --git a/fsck/f2fs.h b/fsck/f2fs.h index eacfd42..e5130ba 100644 --- a/fsck/f2fs.h +++ b/fsck/f2fs.h @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -37,7 +38,6 @@ typecheck(unsigned long long, b) && \ ((long long)((a) - (b)) > 0)) -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #define container_of(ptr, type, member) ({ \ const typeof(((type *)0)->member) * __mptr = (ptr); \ (type *)((char *)__mptr - offsetof(type, member)); }) diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index 568573a..1beb78b 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -19,6 +19,7 @@ #include #include +#include #include #include #ifdef HAVE_CONFIG_H @@ -915,10 +916,6 @@ static_assert(sizeof(struct f2fs_extent) == 12, ""); #define F2FS_PIN_FILE 0x40 /* file should not be gced */ #define F2FS_COMPRESS_RELEASED 0x80 /* file released compressed blocks */ -#if !defined(offsetof) -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -#endif - #define F2FS_EXTRA_ISIZE_OFFSET \ offsetof(struct f2fs_inode, i_extra_isize) #define F2FS_TOTAL_EXTRA_ATTR_SIZE \