Fio 3.15

[fio.git] / flist.h

diff --git a/flist.h b/flist.h
index b4fe6e65f10f2c1dfb02943a0680c7c35e1cc0b6..5437cd80da85ab7581b2282f52669510ef682d20 100644 (file)
--- 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) );})
 
 /*