From 49d7d158702c3d9fa3e62e5965dbd1a5b898b9c7 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 28 Sep 2009 23:25:15 -0400 Subject: [PATCH] compiler.h: use stddef.h for offsetof Signed-off-by: Mathieu Desnoyers --- urcu/compiler.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) 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 /* 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 */ -- 2.34.1