X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=flist.h;h=5437cd80da85ab7581b2282f52669510ef682d20;hp=b4fe6e65f10f2c1dfb02943a0680c7c35e1cc0b6;hb=82a90566caf08964064e74241e5eb5e42c6fb189;hpb=65342a641726a46ec64cd0cadb51b01f9c152812

diff --git a/flist.h b/flist.h
index b4fe6e65..5437cd80 100644
--- a/flist.h
+++ b/flist.h
@@ -2,16 +2,10 @@
 #define _LINUX_FLIST_H
 
 #include <stdlib.h>
+#include <stddef.h>
 
-#undef offsetof
-#ifdef __compiler_offsetof
-#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
-#else
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-#endif
-
-#define container_of(ptr, type, member) ({			\
-	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
+#define container_of(ptr, type, member)  ({			\
+	const __typeof__( ((type *)0)->member ) *__mptr = (ptr);	\
 	(type *)( (char *)__mptr - offsetof(type,member) );})
 
 /*