compiler.h: use stddef.h for offsetof

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 6f6d3e97eb3693ebdd7f8cc509b2acde5c709594..4dd89ea212285e664e2cd3c35e796a9af1d73d1e 100644 (file)
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -18,6 +18,8 @@
  * modified is included with the above copyright notice.
  */
 
+#include <stddef.h>    /* for offsetof */
+
 #define likely(x)      __builtin_expect(!!(x), 1)
 #define unlikely(x)    __builtin_expect(!!(x), 0)
 
@@ -37,14 +39,4 @@
  */
 #define ACCESS_ONCE(x) (*(volatile typeof(x) *)&x)
 
-#if (__GNUC__ == 4)
-#define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
-#endif
-
-#ifdef __compiler_offsetof
-#define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER)
-#else
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-#endif
-
 #endif /* _URCU_COMPILER_H */