X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fapi_gcc.h;h=963f842215dd1eb4e95186b99a7059dbf70a9fe1;hp=1ad7345e7ce1ad681bd2043813bdb5aaaff916a5;hb=3d7be7ca4e2451381a8fc8a00bd6d7dcbf3b678f;hpb=e72f49371b233637eaf143265a73c7322d0710fd

diff --git a/tests/api_gcc.h b/tests/api_gcc.h
index 1ad7345..963f842 100644
--- a/tests/api_gcc.h
+++ b/tests/api_gcc.h
@@ -282,12 +282,12 @@ cmpxchg(volatile long *ptr, long oldval, long newval)
 #include <pthread.h>
 #include <sched.h>
 #include <sys/param.h>
+#include <arch.h>
 /* #include "atomic.h" */
 
 /*
  * Compiler magic.
  */
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #define container_of(ptr, type, member) ({			\
 	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
 	(type *)( (char *)__mptr - offsetof(type,member) );})
@@ -634,7 +634,6 @@ static void smp_init(void)
 #define LIST_POISON1  ((void *) 0x00100100)
 #define LIST_POISON2  ((void *) 0x00200200)
 
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #define container_of(ptr, type, member) ({			\
 	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
 	(type *)( (char *)__mptr - offsetof(type,member) );})