[PATCH 2/2] libext2fs: use offsetof() from stddef.h
From: Michael Forney <hidden>
Date: 2021-04-14 07:42:11
Subsystem:
library code, the rest · Maintainers:
Andrew Morton, Linus Torvalds
offsetof is a standard C feature available from stddef.h, going back all the way to ANSI C. Signed-off-by: Michael Forney <redacted> --- Perhaps there is some reason to prefer compiler builtins over libc that I'm not seeing? lib/ext2fs/compiler.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/lib/ext2fs/compiler.h b/lib/ext2fs/compiler.h
index 03c35ab8..42faa61c 100644
--- a/lib/ext2fs/compiler.h
+++ b/lib/ext2fs/compiler.h@@ -1,18 +1,7 @@ #ifndef _EXT2FS_COMPILER_H #define _EXT2FS_COMPILER_H -#ifndef __has_builtin -#define __has_builtin(x) 0 -#endif - -#undef offsetof -#if __has_builtin(__builtin_offsetof) -#define offsetof(TYPE, MEMBER) __builtin_offsetof(TYPE, MEMBER) -#elif defined(__compiler_offsetof) -#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER) -#else -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -#endif +#include <stddef.h> #ifdef __GNUC__ #define container_of(ptr, type, member) ({ \
--
2.30.1