diff options
| author | Bart Van Assche <bvanassche@acm.org> | 2022-04-21 15:18:20 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2022-04-22 11:43:13 -0700 |
| commit | 24663b62275c969f46203ccca2594323a8e07085 (patch) | |
| tree | f7340e0ffd05c0c424f1ad51072e8658fb4616d2 | |
| parent | cdefef0d077de556bc30e79e1bdd527b9bad6bb9 (diff) | |
| download | f2fs-tools-24663b62275c969f46203ccca2594323a8e07085.tar.gz | |
Include <stddef.h> instead of defining offsetof()
Prepare for enabling -Wmacro-redefined.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fsck/f2fs.h | 2 | ||||
| -rw-r--r-- | include/f2fs_fs.h | 5 |
2 files changed, 2 insertions, 5 deletions
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 <unistd.h> #include <stdio.h> #include <stdbool.h> +#include <stddef.h> #include <errno.h> #include <fcntl.h> #include <string.h> @@ -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 <stdio.h> #include <stdlib.h> +#include <stddef.h> #include <string.h> #include <time.h> #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 \ |