diff options
| author | Michael Forney <mforney@mforney.org> | 2021-04-14 00:41:27 -0700 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2021-07-05 20:22:57 -0400 |
| commit | 9d5fdcc5db1b5246028dc871e5f0fb908dd64771 (patch) | |
| tree | f6a55c07a96b4798ad4e0ff576c57bebf4a76cd0 | |
| parent | f11448318f99aa5fde27aea6b73420d6c495a4f6 (diff) | |
| download | e2fsprogs-9d5fdcc5db1b5246028dc871e5f0fb908dd64771.tar.gz | |
libext2fs: use statement-expression for container_of only on GNU-compatible compilers
Functionally, the statement-expression is not necessary here; it
just gives a bit of type-safety to make sure the pointer really
does have a compatible type with the specified member of the struct.
When statement expressions are not available, we can just use a
portable fallback macro that skips this member type check.
Signed-off-by: Michael Forney <mforney@mforney.org>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | lib/ext2fs/compiler.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ext2fs/compiler.h b/lib/ext2fs/compiler.h index 9aa9b4ec6..03c35ab80 100644 --- a/lib/ext2fs/compiler.h +++ b/lib/ext2fs/compiler.h @@ -14,9 +14,14 @@ #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #endif +#ifdef __GNUC__ #define container_of(ptr, type, member) ({ \ const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) +#else +#define container_of(ptr, type, member) \ + ((type *)((char *)(ptr) - offsetof(type, member))) +#endif #endif /* _EXT2FS_COMPILER_H */ |