Whamcloud - gitweb
libext2fs: use offsetof() from stddef.h
authorMichael Forney <mforney@mforney.org>
Wed, 14 Apr 2021 07:41:28 +0000 (00:41 -0700)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 6 Jul 2021 00:22:57 +0000 (20:22 -0400)
offsetof is a standard C feature available from stddef.h, going
back all the way to ANSI C.

Signed-off-by: Michael Forney <mforney@mforney.org>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
lib/ext2fs/compiler.h

index 03c35ab..42faa61 100644 (file)
@@ -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) ({                     \