From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Tue, 29 Sep 2009 03:25:15 +0000 (-0400)
Subject: compiler.h: use stddef.h for offsetof
X-Git-Tag: v0.1~8
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=49d7d158702c3d9fa3e62e5965dbd1a5b898b9c7;p=userspace-rcu.git

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 6f6d3e9..4dd89ea 100644
--- 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 */